Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2026-06-02 a8b712bc5b0af9ee6da25e1518729b78aa778fed

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

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

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