应付明细14

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

@@ -51,7 +51,7 @@ public class ApiExpectedFortunePageResponse {
     private String brokerGradeName;
     private String brokerGradeName;
 
 
     @Schema(description = "关联人员")
     @Schema(description = "关联人员")
-    private String associatedPerson;
+    private String amountSourceName;
 
 
     @Schema(description = "团队名称")
     @Schema(description = "团队名称")
     private String team;
     private String team;

yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java

@@ -133,13 +133,13 @@ public class ExpectedFortune implements Serializable {
     private String fortuneType;
     private String fortuneType;
 
 
     /**
     /**
-     * 奖金来源id（类型：转介人等，如果是转介人，这里就是这个奖来自这个转介人身上的）
+     * 奖金来源人id（类型：转介人等，如果是转介人，这里就是这个奖来自这个转介人身上的）
      */
      */
     @TableField("amount_source_id")
     @TableField("amount_source_id")
     private String amountSourceId;
     private String amountSourceId;
 
 
     /**
     /**
-     * 奖金来源名称（类型：转介人等）
+     * 奖金来源人名称（类型：转介人等）
      */
      */
     @TableField("amount_source_name")
     @TableField("amount_source_name")
     private String amountSourceName;
     private String amountSourceName;

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -163,6 +163,7 @@
             ef.broker_biz_id,
             ef.broker_biz_id,
             ef.team,
             ef.team,
             ef.team_biz_id,
             ef.team_biz_id,
+            ef.amount_source_name,
             ef.fortune_name,
             ef.fortune_name,
             ef.fortune_type,
             ef.fortune_type,
             ef.broker_ratio,
             ef.broker_ratio,
@@ -221,6 +222,7 @@
             f.broker_biz_id,
             f.broker_biz_id,
             f.team,
             f.team,
             f.team_biz_id,
             f.team_biz_id,
+            NULL as amount_source_name,
             f.fortune_name,
             f.fortune_name,
             f.fortune_type,
             f.fortune_type,
             NULL as broker_ratio,
             NULL as broker_ratio,