Merge branch 'dev_New_pro' into dev_New_pro_财务

zss

7 天以前 b5d5cb947a194ceb34cd2797ab077f1484989305

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

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

    private Long customerId;

    /**