Merge branch 'develop' into develop2

src/custom/restcontroller/sale/shoppingcart/SQL/购物车列表.sql

@@ -29,6 +29,7 @@ SELECT t1.sa_shoppingcartid,
        t3.materialschemeid,
        t3.colorschemeid,
        t3.cheekschemeid,
+       t3.packageqty,
        t3.sa_customschemeid
 FROM sa_shoppingcart t1
          LEFT JOIN sa_brand t2 ON t2.sa_brandid = t1.sa_brandid AND t2.siteid = t1.siteid

src/custom/restcontroller/sale/shoppingcart/SQL/购物车详情.sql

@@ -16,6 +16,7 @@ SELECT t1.sa_shoppingcartid,
        t3.orderaddqty,
        t3.orderminqty_auxunit,
        t3.orderaddqty_auxunit,
+       t3.packageqty,
        t4.unitname,
        t5.unitgroupname,
        t6.unitname auxunitname