Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

yuan

8 天以前 128477234dfccf2b06b608b5569595607d9752cf

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

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

    private Long customerId;

    /**