Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro

gongchunyi

4 天以前 d709e8a7117704ac4717db5201e40964b90d4791

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

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

    /**
     * 跟进方式