From 01714a991da91ab16cdc8eec25a40e12123d7ff6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 31 八月 2023 09:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
index ff0ef90..8bd88e1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
@@ -6,7 +6,7 @@
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>
-        <result column="BTMNAME" property="btmName"/>
+        <result column="BTMNAME" property="btmname"/>
         <result column="LASTR" property="lastR"/>
         <result column="FIRSTR" property="firstR"/>
         <result column="LASTV" property="lastV"/>
@@ -17,7 +17,7 @@
         <result column="LASTMODIFYTIME" property="lastModifyTime"/>
         <result column="REVISIONRULE" property="revisionRule"/>
         <result column="VERSIONRULE" property="versionRule"/>
-        <result column="REVISIONSEQ" property="revisionSeg"/>
+        <result column="REVISIONSEQ" property="revisionSeq"/>
         <result column="REVISIONVALUE" property="revisionValue"/>
         <result column="VERSIONSEQ" property="versionSeq"/>
         <result column="VERSIONVALUE" property="versionValue"/>

--
Gitblit v1.9.3