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 cfe2d30..8d2b0f9 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
@@ -82,16 +82,22 @@ public class CookRecipeDishesVO extends BaseEntity {
@ApiModelProperty("菜品类型")
private Integer mealType;
+
@ApiModelProperty("成本价")
private Integer materialCost;
- @ApiModelProperty("类别名称")
- private String typeName;
+
@ApiModelProperty("类别id")
private Long typeId;
+
+ @ApiModelProperty("类别名称")
+ private String dishesTypeName;
+
@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 fe7566a..bc41bf8 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
@@ -35,8 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
+
+
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
crdd.size_type,
crdd.supply_num,
crdd.sale_num,
- crdd.remanent_num,
+ (crdd.supply_num - crdd.sale_num) as remanent_num,
crdd.limit_num,
crdd.sale_price,
crdd.recommend_flag,