Merge branch 'develop-green' into develop2

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

@@ -609,6 +609,7 @@ public class promotionItems extends Controller {
                     sqlFactory.addParameter("orderminqty", row.getString("orderminqty"));
                     sqlFactory.addParameter("islimit", row.getString("islimit"));
                     sqlFactory.addParameter("signaturecode", row.getString("signaturecode"));
+                    sqlFactory.addParameter("packagetypemx", "");
                     sqllist.add(sqlFactory.getSQL());
                     for (int o = 1; o <= 5; o++) {
                         long sa_promotion_itempriceid = sa_promotion_itempriceids[a];