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

zss

6 天以前 f802cb9f7ed452142fa001511621dff08ca77585

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

@@ -36,7 +36,7 @@
    /**
     * 关联客户ID
     */
    private Integer customerId;
    private Long customerId;

    /**
     * 提醒开关 (0:关闭, 1:开启)