Merge branch 'develop-green' into develop2

# Conflicts:
#	src/custom/restcontroller/R.java

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

@@ -583,7 +583,7 @@ public class promotion extends Controller {
 
 
             Rows rowsdetailshuizong = dbConnect.runSqlQuery("select * from (select t2.itemno,count(1) count from sa_promotion_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.sa_promotionid ='"
-                            + sa_promotionid + "' and  t1.siteid='" + siteid + "' group by t1.itemid,t2.itemno,t1.orderminqty,t1.orderaddqty,t1.groupqty) t where t.count>1");
+                            + sa_promotionid + "' and  t1.siteid='" + siteid + "' group by t1.itemid,t2.itemno,t1.orderminqty,t1.orderaddqty,t1.groupqty,t1.packagetypemx) t where t.count>1");
             if(rowsdetailshuizong.isNotEmpty()){
                 return getErrReturnObject().setErrMsg("商品编码："+rowsdetailshuizong.get(0).getString("itemno")+"活动条件设置重复，禁止审核！").toString();
             }