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

gongchunyi

2 天以前 32536352a81b1cb60add2303b7ef5a8f6bf54a7d

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

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

    /**
     * 跟进方式