From 9fa938d839cbbe50d7f5128bad207fa28437c0a1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 18 Apr 2025 16:05:55 +0800 Subject: [PATCH 1/5] menu_dishes_type crby fix --- .../src/main/resources/mapper/menu/MenuDishesTypeMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml index e698d8e..007ce4b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select type_id, type_name from menu_dishes_type where del_flag = 2 + select type_id, type_name from menu_dishes_type where del_flag = '0' order by create_time desc From f010bf8fc306f7a473911dd4db75f54729578bf5 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 18 Apr 2025 16:10:05 +0800 Subject: [PATCH 3/5] menu_dishes_type crby fix --- .../bonus/canteen/core/menu/domain/MenuDishesType.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishesType.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishesType.java index 674fa42..0343bef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishesType.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishesType.java @@ -25,18 +25,18 @@ public class MenuDishesType extends Model { private String aliasName; @ApiModelProperty("是否默认(1-默认,2-非默认)") private Integer defaultFlag; - @ApiModelProperty("删除标识") + @ApiModelProperty("删除标识(0-正常,2-删除)") private Integer delFlag; @ApiModelProperty("乐观锁") private Integer revision; @ApiModelProperty("创建人") - private String crby; + private String createBy; @ApiModelProperty("创建时间") - private LocalDateTime crtime; + private LocalDateTime createTime; @ApiModelProperty("更新人") - private String upby; + private String updateBy; @ApiModelProperty("更新时间") - private LocalDateTime uptime; + private LocalDateTime updateTime; } From 35df8518b70ce3771ddbe3e68308c7b748ac79d0 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 18 Apr 2025 16:11:18 +0800 Subject: [PATCH 4/5] menu_dishes_type crby fix --- .../core/menu/service/impl/MenuDishesTypeServiceImpl.java | 2 +- .../canteen/core/menu/service/impl/MenuRecipeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java index 91630ad..121d0e7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java @@ -57,7 +57,7 @@ public class MenuDishesTypeServiceImpl extends ServiceImpl Date: Fri, 18 Apr 2025 16:20:55 +0800 Subject: [PATCH 5/5] menu_nutrition del_flag fix --- .../java/com/bonus/canteen/core/menu/domain/MenuNutrition.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java index 531dbec..a256353 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java @@ -184,9 +184,6 @@ public class MenuNutrition extends BaseEntity { @ApiModelProperty(value = "维生素e(mg/100g)") private Double vitaminE; - /** 删除标识(1删除,2正常) */ - private Integer delFlag; - /** 胆碱(mg/100g) */ @Excel(name = "胆碱(mg/100g)") @ApiModelProperty(value = "胆碱(mg/100g)")