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<>();