diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java
index ddb97ae..cfe2d30 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java
@@ -32,6 +32,9 @@ public class CookRecipeDishesVO extends BaseEntity {
@ApiModelProperty(value = "菜品id")
private Long dishesId;
+ @ApiModelProperty(value = "菜品名称")
+ private String dishesName;
+
/** 菜品单价 */
@Excel(name = "菜品单价")
@ApiModelProperty(value = "菜品单价")
@@ -77,5 +80,19 @@ public class CookRecipeDishesVO extends BaseEntity {
@ApiModelProperty(value = "是否推荐(1-推荐,2-不推荐)")
private Long recommendFlag;
+ @ApiModelProperty("菜品类型")
+ private Integer mealType;
+ @ApiModelProperty("成本价")
+ private Integer materialCost;
+ @ApiModelProperty("类别名称")
+ private String typeName;
+ @ApiModelProperty("类别id")
+ private Long typeId;
+ @ApiModelProperty("食堂名称")
+ private String canteenName;
+ @ApiModelProperty("销售方式(1按份,2称重)")
+ private Integer salesMode;
+ @ApiModelProperty("称重单位多少克(默认1kg)")
+ private Integer unitPrice;
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml
index 3348f54..af9438f 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml
@@ -22,6 +22,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
select cr.recipe_id, cr.recipe_name, cr.recipe_type, cr.stall_id, cr.canteen_id, cr.plan_id, cr.effect_date,
cr.expire_date, cr.create_by, cr.create_time, cr.update_by, cr.update_time, cr.del_flag,
@@ -129,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by mrdd.dishes_id
-