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/CodeWupinMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
index c7e7714..83592ad 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.vci.ubcs.code.mapper.CodeWupinMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupinEntity">
+ <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupin">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
--
Gitblit v1.9.3