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/CodeRuleMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml
index cb3e086..ea4b273 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml
@@ -30,6 +30,7 @@
<result property="description" column="DESCRIPTION"/>
<result property="owner" column="OWNER"/>
<result property="copyFromVersion" column="COPYFROMVERSION"/>
+ <result property="tenantId" column="TENANTID"/>
</resultMap>
<select id="selectCodeRulePage" resultMap="codeRuleResultMap">
@@ -58,7 +59,8 @@
PCR.NAME,
PCR.DESCRIPTION,
PCR.OWNER,
- PCR.COPYFROMVERSION
+ PCR.COPYFROMVERSION,
+ PCR.TENANTID
FROM PL_CODE_RULE PCR
<where>
<if test="codeRule.id != null and codeRule.id != ''">
--
Gitblit v1.9.3