From d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 20 五月 2026 09:22:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

---
 src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java b/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java
index f2edcc5..ddd3d4b 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java
@@ -36,7 +36,7 @@
     /**
      * 鍏宠仈瀹㈡埛ID
      */
-    private Integer customerPrivatePoolId;
+    private Long customerId;
 
     /**
      * 鎻愰啋寮�鍏� (0:鍏抽棴, 1:寮�鍚�)

--
Gitblit v1.9.3