Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

9 天以前 0ac75dd7df65965a6087f1f4da1cdfe024685d39

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

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

    /**
     * 跟进方式