From 7b973b3b9b723f48c54f2c0c5083886573224541 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 05 一月 2026 16:40:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
index b144087..0b55833 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
@@ -18,7 +18,7 @@
 
         private String userId;
 
-        private String batchId;
+        private String confId;
 
     public PatrolKey(){
             super();

--
Gitblit v1.9.3