Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -297,6 +297,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 finPaymentrecordOne = new FinPaymentrecord();
                 BeanUtil.copyProperties(finPaymentrecord,finPaymentrecordOne,"sid");
                 finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive()-dto.getCost());
+                finPaymentrecordOne.setCost(finPaymentrecordOne.getAccountsReceive());
             }
             BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
             List<String> payFiles = dto.getPayFiles();

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -1333,7 +1333,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                     return columnName;
                 }
             }).collect(Collectors.toList());
-            columnNames.add("");
+//            columnNames.add("");
             parameterVo.setRow(columnNames);
             dynamicRows.add(parameterVo);
         }