Merge branch 'develop' into develop-green

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -97,9 +97,9 @@ public class cashbill extends Controller {
         try {
 
             // 华为云
-            //e = getPostExcelFactory(content.getLong("attachmentid"));
+            e = getPostExcelFactory(content.getLong("attachmentid"));
             // 本地
-            e = getPostExcelFactory();
+            //e = getPostExcelFactory();
 
             // Rows keyRow = dbConnect.runSqlQuery("select fagentnum,faddress from tagents
             // where 1=2");