Merge branch 'master' into dev

service/src/main/java/com/hfkj/channel/saas/SaasMerService.java

@@ -328,6 +328,7 @@ public class SaasMerService {
         }
 
         if (StringUtils.isNotBlank(merSettleAcctApply.getCommissionImg())) {
+            attachmentsMap = new HashMap<>();
             attachmentsMap.put("imgType", "OTHERS");
             attachmentsMap.put("imgPath", saasCommon.fileUpload(new File(CommonSysConst.getSysConfig().getFile_url() +"/"+ merSettleAcctApply.getCommissionImg()), "OTHERS", "0").getString("url"));
             attachmentsMapList.add(attachmentsMap);