Merge remote-tracking branch 'origin/develop' into develop-test

src/custom/restcontroller/webmanage/sale/enterprisesaleclass/EnterpriseSaleClass.java

@@ -139,6 +139,7 @@ public class EnterpriseSaleClass extends Controller {
             insertSQL.setUniqueid(createTableID("sys_enterprise_saleclass"));
             insertSQL.setValue("sys_enterpriseid", id);
             insertSQL.setValue("itemclassid", itemclassid);
+            insertSQL.setWhere("not exists(select 1 from  sys_enterprise_saleclass where sys_enterpriseid=" + id + " and itemclassid=" + itemclassid +")");
             sqlList.add(insertSQL.getSQL());
         }
         dbConnect.runSqlUpdate(sqlList);