Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/kd/imc/rim/utils/ApiHttpUtils.java

src/main/java/fi/em/formPlugin/BusinessProcessingPlugin.java

@@ -90,7 +90,7 @@ public class BusinessProcessingPlugin extends AbstractFormPlugin implements Plug
         }
         if ("cysgzmx".equals(controls)) {
             List<JSONObject> resdate = new ArrayList<>();
-            //历史数据清除
+            //历史数据清除1111
             this.getModel().deleteEntryData("nckd_entryentity");
             //构建查询应收挂账单参数
             QFilter nckd_orgamountFilter = new QFilter("unsettleamount", QCP.large_than, new BigDecimal(0));