Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

2026-05-22 b97cf434154939778e71089b26efe5762cab80be

 src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java

@@ -37,8 +37,6 @@
    /**
     * 关联的私海id
     */
    private Long customerPrivatePoolId;

    private Long customerId;

    /**