Merge remote-tracking branch 'origin/test' into test

yd-csf-feign/src/main/java/com/yd/csf/feign/response/expectedfortune/ApiExpectedFortunePageResponse.java

@@ -144,6 +144,12 @@ public class ApiExpectedFortunePageResponse {
     private String currency;
     private String currency;
 
 
     /**
     /**
+     * 出账币种名称
+     */
+    @Schema(description = "出账币种名称")
+    private String currencyName;
+
+    /**
      * 默认结算汇率
      * 默认结算汇率
      */
      */
     @Schema(description = "默认结算汇率")
     @Schema(description = "默认结算汇率")

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/ExpectedFortuneServiceImpl.java

@@ -134,7 +134,7 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             ApiExpectedFortunePageResponse vo = new ApiExpectedFortunePageResponse();
             ApiExpectedFortunePageResponse vo = new ApiExpectedFortunePageResponse();
             BeanUtils.copyProperties(ef, vo);
             BeanUtils.copyProperties(ef, vo);
 
 
-            vo.setCurrency(CurrencyEnum.toLabel(ef.getCurrency()));
+            vo.setCurrencyName(CurrencyEnum.toLabel(ef.getCurrency()));
 
 
             String ratio = finalBrokerRatioMap.get(ef.getBrokerBizId());
             String ratio = finalBrokerRatioMap.get(ef.getBrokerBizId());
             vo.setCommissionRatio(ratio);
             vo.setCommissionRatio(ratio);