Merge branch 'dev/mzyh-0617' into 'master'

美中宜和新增字段



See merge request !7

@@ -82,6 +82,9 @@ public class MenuDbDTO {
 
     @ApiModelProperty(value = "发布时间")
     private String publishAt;
+
+    @ApiModelProperty(value = "医嘱冲突检查")
+    private Boolean checkMedicalConflict;
   }
 
   @Data

@@ -46,6 +46,7 @@ public class MenuServiceImpl implements MenuService {
                         .customerScope(menu.getCustomerScope())
                         .nutritionPromotion(menu.getNutritionPromotion())
                         .nutritionalStatistics(menu.getNutritionalStatistics())
+                        .checkMedicalConflict(menu.getCheckMedicalConflict())
                         .dishRuleJson(DishRuleJson.builder()
                                 .days(menu.getDishRuleJson().getDays())
                                 .dishType(menu.getDishRuleJson().getDishType())
@@ -87,6 +88,7 @@ public class MenuServiceImpl implements MenuService {
                                 .customerScope(menu.getCustomerScope())
                                 .nutritionPromotion(menu.getNutritionPromotion())
                                 .nutritionalStatistics(menu.getNutritionalStatistics())
+                                .checkMedicalConflict(menu.getCheckMedicalConflict())
                                 .dishRuleJson(DishRuleJson.builder()
                                         .days(menu.getDishRuleJson().getDays())
                                         .dishType(menu.getDishRuleJson().getDishType())
@@ -129,6 +131,7 @@ public class MenuServiceImpl implements MenuService {
                 .customerScope(menu.getCustomerScope())
                 .nutritionPromotion(menu.getNutritionPromotion())
                 .nutritionalStatistics(menu.getNutritionalStatistics())
+                .checkMedicalConflict(menu.getCheckMedicalConflict())
                 .dishRuleJson(DishRuleJson.builder()
                         .days(menu.getDishRuleJson().getDays())
                         .dishType(menu.getDishRuleJson().getDishType())

@@ -79,6 +79,7 @@ message SingleMenuRpcResponse {
   int32 updateSource = 16;
   bool isDeleted = 17;
   int64 publishAt = 18;
+  bool checkMedicalConflict = 19;
 }
 
 message OrderRuleJson {
@@ -201,6 +202,7 @@ message MenuCreation{
   DishRuleJson dishRuleJson = 11;
   bool shouldCreatePublishAt = 12;
   int64 publishAt = 13;
+  bool checkMedicalConflict = 14;
 }
 
 message CreateMenuRpcRequest {
@@ -247,6 +249,8 @@ message MenuModification {
   DishRuleJson dishRuleJson = 17;
   bool shouldUpdatePublishAt = 18;
   int64 publishAt = 19;
+  bool shouldUpdateCheckMedicalConflict = 20;
+  bool checkMedicalConflict = 21;
 }
 
 message UpdateMenuRpcRequest {