From adf58ddc0337678c2a6770fe8687e54a44998c0d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
index 1e70e5c..a2d92d1 100644
--- a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
@@ -23,7 +23,7 @@
 			ifw.id,
 			d.name deviceName,
 			dc.name className,
-			d.create_time ,
+			ifw.create_time ,
 			ifw.operate_type,
 			di.serial_no
 		from

--
Gitblit v1.9.1