Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro

yuan

10 天以前 c7d9ef156e031165f6b0f2d949a6500db9f03bd1

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

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

    private Long customerId;

    /**