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

yyb

4 天以前 793f77aaecdb801b68bf84da4ea8dcac7a3157d4

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

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

    private Long customerId;

    /**