push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalarySplitServiceImpl.java

@@ -311,7 +311,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         exportParam.setFieldNames(Arrays.asList(
         exportParam.setFieldNames(Arrays.asList(
                 "salarySplitNo","businessNo","brokerName","team","fromAmount",
                 "salarySplitNo","businessNo","brokerName","team","fromAmount",
                 "currency","exchangeRate","toAmount","toCurrency",
                 "currency","exchangeRate","toAmount","toCurrency",
-                "fortuneAccountMonth","billOrg","hkdAmount"
+                "fortuneAccountMonth","billOrg","amount"
         ));
         ));
         exportParam.setFileName("薪资拆分应发信息汇总");
         exportParam.setFileName("薪资拆分应发信息汇总");
         exportParam.setUploadToOss(true);
         exportParam.setUploadToOss(true);

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/excel/ApiSalarySplitSummaryExcelDto.java

@@ -44,6 +44,6 @@ public class ApiSalarySplitSummaryExcelDto {
     private String billOrg;
     private String billOrg;
 
 
     @Excel(name = "本期总出账金额（原币种）", orderNum = "12")
     @Excel(name = "本期总出账金额（原币种）", orderNum = "12")
-    private BigDecimal hkdAmount;
+    private BigDecimal amount;
 
 
 }
 }