diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/controller/BasicCanteenSuggestionPictureController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/controller/BasicCanteenSuggestionPictureController.java
deleted file mode 100644
index 2658d1f..0000000
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/controller/BasicCanteenSuggestionPictureController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.bonus.canteen.core.basic.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import com.bonus.common.log.enums.OperaType;
-//import com.bonus.canteen.core.basic.common.annotation.PreventRepeatSubmit;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.bonus.common.log.annotation.SysLog;
-import com.bonus.common.security.annotation.RequiresPermissions;
-import com.bonus.canteen.core.basic.domain.BasicCanteenSuggestionPicture;
-import com.bonus.canteen.core.basic.service.IBasicCanteenSuggestionPictureService;
-import com.bonus.common.core.web.controller.BaseController;
-import com.bonus.common.core.web.domain.AjaxResult;
-import com.bonus.common.core.utils.poi.ExcelUtil;
-import com.bonus.common.core.web.page.TableDataInfo;
-
-/**
- * 订单评价菜品Controller
- * 
- * @author xsheng
- * @date 2025-05-25
- */
-@Api(tags = "订单评价菜品接口")
-@RestController
-@RequestMapping("/basic_canteen_suggestion_picture")
-public class BasicCanteenSuggestionPictureController extends BaseController {
-    @Autowired
-    private IBasicCanteenSuggestionPictureService basicCanteenSuggestionPictureService;
-
-    /**
-     * 查询订单评价菜品列表
-     */
-    @ApiOperation(value = "查询订单评价菜品列表")
-    //@RequiresPermissions("basic:picture:list")
-    @GetMapping("/list")
-    public TableDataInfo list(BasicCanteenSuggestionPicture basicCanteenSuggestionPicture) {
-        startPage();
-        List<BasicCanteenSuggestionPicture> list = basicCanteenSuggestionPictureService.selectBasicCanteenSuggestionPictureList(basicCanteenSuggestionPicture);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单评价菜品列表
-     */
-    @ApiOperation(value = "导出订单评价菜品列表")
-    //@PreventRepeatSubmit
-    //@RequiresPermissions("basic:picture:export")
-    @SysLog(title = "订单评价菜品", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出订单评价菜品")
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, BasicCanteenSuggestionPicture basicCanteenSuggestionPicture) {
-        List<BasicCanteenSuggestionPicture> list = basicCanteenSuggestionPictureService.selectBasicCanteenSuggestionPictureList(basicCanteenSuggestionPicture);
-        ExcelUtil<BasicCanteenSuggestionPicture> util = new ExcelUtil<BasicCanteenSuggestionPicture>(BasicCanteenSuggestionPicture.class);
-        util.exportExcel(response, list, "订单评价菜品数据");
-    }
-
-    /**
-     * 获取订单评价菜品详细信息
-     */
-    @ApiOperation(value = "获取订单评价菜品详细信息")
-    //@RequiresPermissions("basic:picture:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(basicCanteenSuggestionPictureService.selectBasicCanteenSuggestionPictureById(id));
-    }
-
-    /**
-     * 新增订单评价菜品
-     */
-    @ApiOperation(value = "新增订单评价菜品")
-    //@PreventRepeatSubmit
-    //@RequiresPermissions("basic:picture:add")
-    @SysLog(title = "订单评价菜品", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增订单评价菜品")
-    @PostMapping
-    public AjaxResult add(@RequestBody BasicCanteenSuggestionPicture basicCanteenSuggestionPicture) {
-        try {
-            return toAjax(basicCanteenSuggestionPictureService.insertBasicCanteenSuggestionPicture(basicCanteenSuggestionPicture));
-        } catch (Exception e) {
-            return error(e.getMessage());
-        }
-    }
-
-    /**
-     * 修改订单评价菜品
-     */
-    @ApiOperation(value = "修改订单评价菜品")
-    //@PreventRepeatSubmit
-    //@RequiresPermissions("basic:picture:edit")
-    @SysLog(title = "订单评价菜品", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改订单评价菜品")
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody BasicCanteenSuggestionPicture basicCanteenSuggestionPicture) {
-        try {
-            return toAjax(basicCanteenSuggestionPictureService.updateBasicCanteenSuggestionPicture(basicCanteenSuggestionPicture));
-        } catch (Exception e) {
-            return error(e.getMessage());
-        }
-    }
-
-    /**
-     * 删除订单评价菜品
-     */
-    @ApiOperation(value = "删除订单评价菜品")
-    //@PreventRepeatSubmit
-    //@RequiresPermissions("basic:picture:remove")
-    @SysLog(title = "订单评价菜品", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除订单评价菜品")
-	@PostMapping("/del/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(basicCanteenSuggestionPictureService.deleteBasicCanteenSuggestionPictureByIds(ids));
-    }
-}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenEvaluateServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenEvaluateServiceImpl.java
index 6033d85..6c8ea77 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenEvaluateServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenEvaluateServiceImpl.java
@@ -3,6 +3,7 @@ package com.bonus.canteen.core.basic.service.impl;
 import java.util.List;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.basic.mapper.BasicCanteenEvaluateMapper;
@@ -51,6 +52,9 @@ public class BasicCanteenEvaluateServiceImpl implements IBasicCanteenEvaluateSer
     @Override
     public int insertBasicCanteenEvaluate(BasicCanteenEvaluate basicCanteenEvaluate) {
         basicCanteenEvaluate.setCreateTime(DateUtils.getNowDate());
+        basicCanteenEvaluate.setCreateBy(SecurityUtils.getUsername());
+        basicCanteenEvaluate.setUserId(SecurityUtils.getUserId());
+        basicCanteenEvaluate.setEvaluateDate(DateUtils.getNowDate());
         try {
             return basicCanteenEvaluateMapper.insertBasicCanteenEvaluate(basicCanteenEvaluate);
         } catch (Exception e) {
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml
index c8e4f7c..256ea06 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenEvaluateMapper.xml
@@ -25,31 +25,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBasicCanteenEvaluateVo">
-        select evaluate_id, user_id, area_id, canteen_id, stall_id, evaluate_date, appearance, attitude, taste, varieties, hygiene, price, weight, proposal, create_by, create_time, update_by, update_time from basic_canteen_evaluate
+        select bce.evaluate_id, bce.user_id, bce.area_id, bce.canteen_id, bce.stall_id, bce.evaluate_date, bce.appearance,
+               bce.attitude, bce.taste, bce.varieties, bce.hygiene, bce.price, bce.weight, bce.proposal, bce.create_by,
+               bce.create_time, bce.update_by, bce.update_time,
+               su.nick_name, ba.area_name, bc.canteen_name, bst.stall_name
+        from basic_canteen_evaluate bce
+         left join sys_user su on su.user_id = bce.user_id
+         left join basic_area ba on ba.area_id = bce.area_id
+         left join basic_canteen bc on bc.canteen_id = bce.canteen_id
+         left join basic_stall bst on bst.stall_id = bce.stall_id
     </sql>
 
     <select id="selectBasicCanteenEvaluateList" parameterType="com.bonus.canteen.core.basic.domain.BasicCanteenEvaluate" resultMap="BasicCanteenEvaluateResult">
         <include refid="selectBasicCanteenEvaluateVo"/>
         <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="areaId != null "> and area_id = #{areaId}</if>
-            <if test="canteenId != null "> and canteen_id = #{canteenId}</if>
-            <if test="stallId != null "> and stall_id = #{stallId}</if>
-            <if test="evaluateDate != null "> and evaluate_date = #{evaluateDate}</if>
-            <if test="appearance != null "> and appearance = #{appearance}</if>
-            <if test="attitude != null "> and attitude = #{attitude}</if>
-            <if test="taste != null "> and taste = #{taste}</if>
-            <if test="varieties != null "> and varieties = #{varieties}</if>
-            <if test="hygiene != null "> and hygiene = #{hygiene}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="weight != null "> and weight = #{weight}</if>
-            <if test="proposal != null  and proposal != ''"> and proposal = #{proposal}</if>
+            <if test="userId != null "> and bce.user_id = #{userId}</if>
+            <if test="areaId != null "> and bce.area_id = #{areaId}</if>
+            <if test="canteenId != null "> and bce.canteen_id = #{canteenId}</if>
+            <if test="stallId != null "> and bce.stall_id = #{stallId}</if>
+            <if test="evaluateDate != null "> and bce.evaluate_date = #{evaluateDate}</if>
+            <if test="appearance != null "> and bce.appearance = #{appearance}</if>
+            <if test="attitude != null "> and bce.attitude = #{attitude}</if>
+            <if test="taste != null "> and bce.taste = #{taste}</if>
+            <if test="varieties != null "> and bce.varieties = #{varieties}</if>
+            <if test="hygiene != null "> and bce.hygiene = #{hygiene}</if>
+            <if test="price != null "> and bce.price = #{price}</if>
+            <if test="weight != null "> and bce.weight = #{weight}</if>
+            <if test="proposal != null  and proposal != ''"> and bce.proposal = #{proposal}</if>
         </where>
     </select>
     
     <select id="selectBasicCanteenEvaluateByEvaluateId" parameterType="Long" resultMap="BasicCanteenEvaluateResult">
         <include refid="selectBasicCanteenEvaluateVo"/>
-        where evaluate_id = #{evaluateId}
+        where bce.evaluate_id = #{evaluateId}
     </select>
         
     <insert id="insertBasicCanteenEvaluate" parameterType="com.bonus.canteen.core.basic.domain.BasicCanteenEvaluate" useGeneratedKeys="true" keyProperty="evaluateId">
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml
index ab59a6c..61d4a71 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
             <if test="rate != null "> and rate = #{rate}</if>
+            <if test="weighType != null "> and weigh_type = #{weighType}</if>
         </where>
     </select>