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

云

2 天以前 9683f8f2b526f67bff039a1cd46818808b53ab3e

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

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

    private Long customerId;

    /**