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

zss

7 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

 src/main/java/com/ruoyi/basic/vo/CustomerVo.java

@@ -11,4 +11,18 @@
public class CustomerVo extends Customer {
    @ApiModelProperty(value = "跟进记录")
    private List<CustomerFollowUpDto> followUpList;

    private String usageUserName;

    private String togetherUserNames;

    /**
     * 共享用户ID列表
     */
    private List<Long> userIds;

    /**
     * 共享用户ID字符串（SQL查询返回，用于转换为List）
     */
    private String userIdsStr;
}