Merge remote-tracking branch 'origin/dev' into prod

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyListRequest.java

+package com.yd.insurance.base.feign.request.insurancereconciliationcompany;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiInsuranceReconciliationCompanyListRequest {
+
+    /**
+     * 保险对账公司表唯一业务ID
+     */
+    private List<String> reconciliationCompanyBizIdList;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/usersaleexpand/ApiUserSaleExpandPageResponse.java

@@ -63,6 +63,17 @@ public class ApiUserSaleExpandPageResponse {
     private String deptName;
 
     /**
+     * 团队表唯一业务ID
+     * 写个更新SQL，更新user_sale_expand表的team_biz_id和team_name字段。取值来源于agent_manage_relation和team表关联，team表的团队长就是管理团队的最高层，凡是在管理关系表中的销售人都在这个团队的树形关系上，都属于这个团队，那么这个更新SQL咋写
+     */
+    private String teamBizId;
+
+    /**
+     * 团队名称
+     */
+    private String teamName;
+
+    /**
      * 状态(0:停用 1:启用)
      */
     private Integer status;

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/UserSaleExpand.java

@@ -89,6 +89,18 @@ public class UserSaleExpand implements Serializable {
     private String deptName;
 
     /**
+     * 团队表唯一业务ID
+     */
+    @TableField("team_biz_id")
+    private String teamBizId;
+
+    /**
+     * 团队名称
+     */
+    @TableField("team_name")
+    private String teamName;
+
+    /**
      * 状态(0:停用 1:启用)
      */
     @TableField("status")