Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

gongchunyi

7 天以前 09484518df0ab310dc8ee7b1caf118a90a409c63

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

@@ -36,8 +36,6 @@
    /**
     * 关联客户ID
     */
//    private Integer customerPrivatePoolId;

    private Long customerId;

    /**