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

云

9 天以前 67031ba3128a445cede7253ab9e0a50885ba0382

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

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

    private Long customerId;

    /**