Merge branch 'dev_New_pro' into dev_New_pro_玉山机械

buhuazhen

6 天以前 08553c034773008ba68b7b6709683b385610ee4f

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

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

    private Long customerId;

    /**