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

zss

5 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

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

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

    /**
     * 跟进方式