From 10aa9de97767d7005672ee69ae8bf6cd603a4042 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 12 May 2025 13:15:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0apk=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/device/DoubleScreenMachineMapper.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
index f0e97b1..2f091c0 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
@@ -237,9 +237,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateContent != null and updateContent != ''">
                 update_content = #{updateContent},
             </if>
-            <if test="updateContent != null and updateContent != ''">
-                update_content = #{updateContent},
-            </if>
             <if test="deployUser != null and deployUser != ''">
                 deploy_user = #{deployUser},
             </if>

From 1c8f6676dacdb93770aee83dba6af5c3fec87522 Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Tue, 13 May 2025 09:55:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E8=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/menu/service/impl/MenuDishesServiceImpl.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
index 33ee0c3..2feb943 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
@@ -72,7 +72,7 @@ import javax.validation.constraints.Size;
  */
 @Service
 public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDishes>  implements IMenuDishesService {
-    @Autowired
+    @Resource
     private MenuDishesMapper menuDishesMapper;
 
     @Resource
@@ -204,8 +204,7 @@ public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDis
                 menuDishesMapper.updateMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()));
                 menuDishesMapper.addMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()),materialList);
             }
-            NutritionEntityUtil nutritionEntityUtil = new NutritionEntityUtil();
-            NutritionEntity nutritionEntity = nutritionEntityUtil.countNutrition(nutritionEntityList);
+            NutritionEntity nutritionEntity = NutritionEntityUtil.countNutrition(nutritionEntityList);
             if(nutritionEntityList !=null && nutritionEntityList.size() >0){
                 System.err.println("总和："+nutritionEntity.getCalcium());
                 //计算营养成分
@@ -300,8 +299,7 @@ public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDis
             //添加菜品和材料关系表
             menuDishesMapper.updateMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()));
             menuDishesMapper.addMenuMaterialDishes(dishesId,materialList);
-            NutritionEntityUtil nutritionEntityUtil = new NutritionEntityUtil();
-            NutritionEntity nutritionEntity = nutritionEntityUtil.countNutrition(nutritionEntityList);
+            NutritionEntity nutritionEntity = NutritionEntityUtil.countNutrition(nutritionEntityList);
             if(nutritionEntityList !=null && nutritionEntityList.size() >0){
                 System.err.println("总和："+nutritionEntity.getCalcium());
                 //计算营养成分