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

yuan

3 天以前 372d212912401059defe5fe83379c50d1033c06e

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

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

    private Long customerId;

    /**