Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -258,9 +258,9 @@ public class ItempriceadjustItemprice extends Controller {
         try {
 
             // 华为云
-            e = getPostExcelFactory(content.getLong("attachmentid"));
+//            e = getPostExcelFactory(content.getLong("attachmentid"));
             // 本地
-            //e = getPostExcelFactory();
+            e = getPostExcelFactory();
 
             ArrayList<String> keys = new ArrayList<>();
             ArrayList<String> sqllist = new ArrayList<>();
@@ -282,7 +282,7 @@ public class ItempriceadjustItemprice extends Controller {
             cellMap.put("price5", CellType.STRING);
             Rows rows = e.getSheetRows(0, keys, cellMap, 3);
 
-            ArrayList<String> itemnoList = rows.toArrayList("itemno");
+            ArrayList<String> itemnoList = rows.toArrayList("itemno", false);
             itemnoList.add("-1");
 
             boolean iserr = false;