Merge branch 'develop' into develop-yellow

src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

@@ -552,6 +552,7 @@ public class promotionItems extends Controller {
                     sqlFactory.addParameter("sa_promotion_itemgroupid", 0);
                     sqlFactory.addParameter("groupqty", row.getString("groupqty"));
                     sqlFactory.addParameter("itemid", row.getString("itemid"));
+                    sqlFactory.addParameter("itemno", row.getString("itemno"));
                     sqlFactory.addParameter("orderaddqty", row.getString("orderaddqty"));
                     sqlFactory.addParameter("orderminqty", row.getString("orderminqty"));
                     sqlFactory.addParameter("islimit", row.getString("islimit"));

src/custom/service/AutoDockItemService.java

@@ -218,7 +218,7 @@ public class AutoDockItemService extends ServiceController {
                         }
                         updateSQL.setValue("spec", spec);//尺寸
                         if(!iscustomsize){
-                            updateSQL.setValue("sa_customschemeid", 0);
+                            //updateSQL.setValue("sa_customschemeid", 0);
                             updateSQL.setValue("materialschemeid", 0);
                             updateSQL.setValue("colorschemeid", 0);
                             updateSQL.setValue("cheekschemeid", 0);