Merge branch 'develop-green' into develop2

src/custom/restcontroller/webmanage/sale/order/SQL/促销方案商品列表.sql

@@ -10,9 +10,9 @@ SELECT t1.itemid,
        t1.sa_customschemeid,
        t1.materialschemeid,
        t1.colorschemeid,
-       t1.cheekschemeid,
        t3.orderminqty,
        t1.orderaddqty_auxunit,
+       t1.packageqty,
        t3.orderaddqty,
        t3.sa_promotion_itemsid,
        t3.signaturecode,