Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerFollowRecordListVo.java

@@ -24,6 +24,14 @@ public class CustomerFollowRecordListVo implements Serializable {
      * 客户id
      */
     private String customerId;
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+    /**
+     * 城投id
+     */
+    private String uipId;
     /**
      * 客户名称
      */

dsk-system/src/main/resources/mapper/system/customer/CustomerFollowRecordMapper.xml

@@ -9,7 +9,7 @@
 
     <select id="selectAuthList" resultType="com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo">
         select
-            ct.company_name, u.nick_name,
+            ct.company_id, ct.uip_id, ct.company_name, u.nick_name,
             <include refid="Base_Bean"></include>
         from customer_follow_record cfr
         join customer ct on ct.customer_id = cfr.customer_id