Merge branch 'develop' into develop-yellow

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

@@ -333,6 +333,7 @@ public class itemclass extends Controller {
 				sqlFactory.addParameter("sa_brandid", row.getString("sa_brandid"));
 
 				sqlFactory.addParameter_SQL("where", where);
+				sqlFactory.addParameter_SQL("where2", " 1=1 ");
 				String sql = sqlFactory.getSQL();
 				Rows allrows = dbConnect.runSqlQuery(sql);
 				/*