Merge branch 'develop-green' into develop2

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -664,7 +664,7 @@ public class Order extends Controller {
         row.replace("defaultamount", row.getBigDecimal("defaultamount").add(costamount));
 
         //订单套餐
-        Rows packagetypemxrows =dbConnect.runSqlQuery("select t2.packagetypemx,min(t1.qty/t2.orderminqty) packagetypeqty from sa_orderitems t1 inner join sa_promotion_items t2 on t1.sa_promotion_itemsid=t2.sa_promotion_itemsid and t1.siteid=t2.siteid where t1.siteid='"+siteid+"' and  t1.sa_orderid="+sa_orderid+" group by t2.packagetypemx");
+        Rows packagetypemxrows =dbConnect.runSqlQuery("select t2.packagetypemx,min(t1.qty/t2.orderminqty) packagetypeqty from sa_orderitems t1 inner join sa_promotion_items t2 on t1.sa_promotion_itemsid=t2.sa_promotion_itemsid and t1.siteid=t2.siteid where t1.siteid='"+siteid+"' and  t1.sa_orderid="+sa_orderid+" and ifnull(t2.packagetypemx,'')!='' group by t2.packagetypemx");
         row.put("packagetypemxrows",packagetypemxrows);
         return getSucReturnObject().setData(row).toString();
     }