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; } 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)") 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