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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2544,10 +2544,10 @@ public class OrderSdkAdapter {
             extInfo.setThirdCategoryId(product.getThirdCategoryId());
         }
 
-        //extInfo.setStapleFood(product.getStapleFood());
-        if (product.getStapleFood()!=null && product.getStapleFood()>0) {
-            extInfo.setStapleFood(1);
-        }
+        extInfo.setStapleFood(product.getStapleFood());
+        //if (product.getStapleFood()!=null && product.getStapleFood()>0) {
+        //    extInfo.setStapleFood(1);
+        //}
         // todo 订单行扩展字段商品组
         extInfo.setProductGroupList(product.getProductGroupList());