From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml
index 0e54ee9..6eb679e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceInfoMapper.xml
@@ -13,8 +13,8 @@
, d.depart_id
, d.CREATE_TIME
, d.UPDATE_TIME
- , d.CREATE_USER
- , d.UPDATE_USER
+ , d.create_by
+ , d.update_by
from nc_device_info d
inner join (select device_id from nc_device_permission where user_id=#{userId}) dp
on d.device_id=dp.device_id
--
Gitblit v1.9.3