Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

3 天以前 ee156a360b75a0e54d34a56a67930893c84d0eab

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

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

    private Long customerId;

    /**