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

zss

2 天以前 d5d089eff99cd51695697679a95445b6b5b0d205

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

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

    private Long customerId;

    /**