Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop

order-application-service/src/main/java/cn/freemud/entities/dto/ProductComboListDto.java

@@ -40,7 +40,7 @@ public class ProductComboListDto {
     private Integer stockLimit;
     private String unit;
     /* 是否主食*/
-    private Integer stapleFood;
+    private Integer isStaple;
     protected List<ProductAttributeGroup> productAttributeGroupList;
 
 }

order-application-service/src/main/java/cn/freemud/service/impl/ItemServiceImpl.java

@@ -135,8 +135,8 @@ public class ItemServiceImpl implements ItemService{
                 GetProductsVo comboProductsVo = new GetProductsVo();
                 comboProductsVo.setCustomerCode(productComboListDto.getCustomerCode());
                 comboProductsVo.setProductCode(productComboListDto.getProductCode());
-                if (productComboListDto.getStapleFood()!=null && stapleFood.contains(productComboListDto.getStapleFood())) {
-                    comboProductsVo.setStapleFood(productComboListDto.getStapleFood());
+                if (productComboListDto.getIsStaple()!=null && stapleFood.contains(productComboListDto.getIsStaple())) {
+                    comboProductsVo.setStapleFood(productComboListDto.getIsStaple());
                 } else {
                     comboProductsVo.setStapleFood(0);
                 }