Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

4 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

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

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

    private Long customerId;

    /**