Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

昨天 c15e67c83394c1734eb4e9802d8f343c6076efc1

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

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

    private Long customerId;

    /**