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

liyong

3 天以前 33f9eae4ad4321860e4881f5f38dad6368c878ef

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

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

    private Long customerId;

    /**