Merge branch 'dev_New_pro' into dev_新疆马铃薯pro

云

2 天以前 16338016e73791cecbbdbdd73e972b29a06c59b1

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

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

    private Long customerId;

    /**