From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
index b23f6e2..09e3ded 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
@@ -80,31 +80,27 @@
description,
oid,
versionseq,
- checkinby,
revisionrule,
lctid,
id,
owner,
- checkoutby,
creator,
createtime,
- isfirstv,
+ firstv,
attributegroup,
revisionoid,
btmname,
- checkouttime,
revisionvalue,
versionrule,
name,
- islastr,
+ lastr,
lastmodifytime,
copyfromversion,
nameoid,
lcstatus,
- islastv,
- checkintime,
+ lastv,
codephaseoid,
- isfirstr
+ firstr
from PL_CODE_PHASEATTR
where codephaseoid in
(#{oids})
--
Gitblit v1.9.3