Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

9 天以前 d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff

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

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

    /**
     * 跟进方式