Merge branch 'oa_2022-03-29' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/FinancialExpenditureServiceImpl.java

@@ -249,6 +249,9 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                         continue;
                     }
                     String submitForm = oaInputDto.getModel();
+                    if(Objects.isNull(formData.get(submitForm))){
+                        continue;
+                    }
                     List<HashMap> hashMaps = JSONObject.parseArray(formData.get(submitForm).toString(), HashMap.class);
                     for (HashMap hashMap : hashMaps) {
                         FinancialExpenditure financialExpenditure = new FinancialExpenditure();

mec-web/src/main/resources/columnMapper.ini

@@ -54,9 +54,9 @@
 退还课程费用 = refundCourseFee
 退款金额（元） = amount
 情况说明 = cause
-收款帐号 = merNo
 开户行 = bankAddress
 收款账户名 = merNoName
+收款账号 = merNo
 
 [兑换码分配模板表]
 代码 = code