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

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

@@ -723,7 +723,7 @@ public class OrderItems extends Controller {
 
         SQLFactory sqlFactory4 = new SQLFactory(this, "商品等级价格查询");
         sqlFactory4.addParameter("siteid", siteid);
-        sqlFactory4.addParameter("itemid", ids);
+        sqlFactory4.addParameter_in("itemid", ids);
         sqlFactory4.addParameter("sys_enterpriseid", sys_enterpriseid);
         Rows pricegradeRows = dbConnect.runSqlQuery(sqlFactory4);
         RowsMap pricegradeRowsMap = pricegradeRows.toRowsMap("itemid");