diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/AppletCurrentDishesDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/AppletCurrentDishesDetailVO.java
index f9925c6..e2a9cdd 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/AppletCurrentDishesDetailVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/AppletCurrentDishesDetailVO.java
@@ -12,6 +12,8 @@ public class AppletCurrentDishesDetailVO {
private Long dishesId;
@ApiModelProperty("菜品名称")
private String dishesName;
+ @ApiModelProperty("菜品简介")
+ private String intro;
@ApiModelProperty("库存数量")
private Integer remanentNum;
@ApiModelProperty("限购数量")
@@ -49,6 +51,14 @@ public class AppletCurrentDishesDetailVO {
return this.dishesName;
}
+ public String getIntro() {
+ return intro;
+ }
+
+ public void setIntro(String intro) {
+ this.intro = intro;
+ }
+
public Integer getDishesPrice() {
return this.dishesPrice;
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml
index 3e33c21..4b3a4ae 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml
@@ -39,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
@@ -72,7 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
@@ -132,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mrd.mealtime_type,
md.meal_type as type_id,
'菜品' as type_name,
+ md.dishes_id as base_dishes_id,
md.dishes_id,
md.dishes_name,
md.dishes_name as real_dishes_name,
@@ -220,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mrd.mealtime_type,
if(md.meal_type = 2, 2, mdt.dishes_type_id) as type_id,
if(md.meal_type = 2, '套餐', mdt.dishes_type_name) as type_name,
+ md.dishes_id as base_dishes_id,
md.dishes_id,
md.dishes_name,
md.intro,