删除cook_dishes_base

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java

@@ -30,8 +30,6 @@ public class CookDishes extends BaseEntity {
     /** 菜品id */
     private Long dishesId;
 
-    private Long baseDishesId;
-
     /** 类型(1-菜品,2-套餐) */
     @Excel(name = "类型(1-菜品,2-套餐)")
     @ApiModelProperty(value = "类型(1-菜品,2-套餐)")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/AppletDishesDetailVO.java

@@ -3,13 +3,15 @@ package com.bonus.canteen.core.cook.vo;
 import com.bonus.canteen.core.utils.SysUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
 @ApiModel("小程序菜品详情")
+@Data
 public class AppletDishesDetailVO {
    @ApiModelProperty("菜品id")
-   private Long baseDishesId;
+   private Long dishesId;
    @ApiModelProperty("类型(1-菜品,2-套餐)")
    private Integer mealType;
    @ApiModelProperty("自定义id")
@@ -35,96 +37,4 @@ public class AppletDishesDetailVO {
    public String getImageUrl() {
       return SysUtil.getCutFileUrl(this.imageUrl);
    }
-
-   public Long getBaseDishesId() {
-      return this.baseDishesId;
-   }
-
-   public Integer getMealType() {
-      return this.mealType;
-   }
-
-   public Long getCustomId() {
-      return this.customId;
-   }
-
-   public String getDishesName() {
-      return this.dishesName;
-   }
-
-   public String getAliasName() {
-      return this.aliasName;
-   }
-
-   public String getIntro() {
-      return this.intro;
-   }
-
-   public String getParticulars() {
-      return this.particulars;
-   }
-
-   public Integer getIsFavorites() {
-      return this.isFavorites;
-   }
-
-   public List<AppletDishesSizeV2VO> getDishesDetailList() {
-      return this.dishesDetailList;
-   }
-
-   public List<MenuMaterialBasVO> getMaterialList() {
-      return this.materialList;
-   }
-
-   public List<String> getPackageDishesList() {
-      return this.packageDishesList;
-   }
-
-   public void setBaseDishesId(final Long baseDishesId) {
-      this.baseDishesId = baseDishesId;
-   }
-
-   public void setMealType(final Integer mealType) {
-      this.mealType = mealType;
-   }
-
-   public void setCustomId(final Long customId) {
-      this.customId = customId;
-   }
-
-   public void setDishesName(final String dishesName) {
-      this.dishesName = dishesName;
-   }
-
-   public void setAliasName(final String aliasName) {
-      this.aliasName = aliasName;
-   }
-
-   public void setImageUrl(final String imageUrl) {
-      this.imageUrl = imageUrl;
-   }
-
-   public void setIntro(final String intro) {
-      this.intro = intro;
-   }
-
-   public void setParticulars(final String particulars) {
-      this.particulars = particulars;
-   }
-
-   public void setIsFavorites(final Integer isFavorites) {
-      this.isFavorites = isFavorites;
-   }
-
-   public void setDishesDetailList(final List<AppletDishesSizeV2VO> dishesDetailList) {
-      this.dishesDetailList = dishesDetailList;
-   }
-
-   public void setMaterialList(final List<MenuMaterialBasVO> materialList) {
-      this.materialList = materialList;
-   }
-
-   public void setPackageDishesList(final List<String> packageDishesList) {
-      this.packageDishesList = packageDishesList;
-   }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveRecipeDishesVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 public class CookH5ReserveRecipeDishesVO {
     @ApiModelProperty("菜品id")
-    private Long baseDishesId;
+    private Long dishesId;
     @ApiModelProperty("菜品名称")
     private String dishesName;
     @ApiModelProperty("菜品类型")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5WeekDishesVO.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Data
 public class CookH5WeekDishesVO {
     @ApiModelProperty("菜品id")
-    private Long baseDishesId;
+    private Long dishesId;
     @ApiModelProperty("菜品名称")
     private String dishesName;
     @ApiModelProperty("菜品图片")