Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

zss

3 天以前 9d42f647f5589e4a560d745d6b359ae6c273bd8d

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

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

    /**
     * 跟进方式