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

liyong

8 天以前 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

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

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

    private Long customerId;

    /**