From 6577612f57dc34ca19636991446c5e3206806a80 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 四月 2023 10:45:26 +0800
Subject: [PATCH] 代码合并
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml
index 078fbe1..081ee38 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml
@@ -15,25 +15,36 @@
<result column="tenant_id" property="tenantId"/>
<result column="key" property="key"/>
<result column="label" property="label"/>
-<!-- <result column="type" property="type"/>-->
+ <result column="create_user" property="createUser" jdbcType="NUMERIC"/>
+ <result column="create_dept" property="createDept" jdbcType="NUMERIC"/>
+ <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+ <result column="update_user" property="updateUser" jdbcType="NUMERIC"/>
+ <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+ <result column="status" property="status" jdbcType="NUMERIC"/>
+ <result column="is_deleted" property="isDeleted" jdbcType="NUMERIC"/>
+ <result column="tenant_id" property="tenantId" jdbcType="NUMERIC"/>
+ <result column="key" property="key" jdbcType="VARCHAR"/>
+ <result column="label" property="label" jdbcType="VARCHAR"/>
+<!-- <result column="type" property="type" jdbcType="VARCHAR"/>-->
<result column="hashtag" property="hashtag" jdbcType="VARCHAR"/>
<result column="description" property="description" jdbcType="VARCHAR"/>
</resultMap>
-<!-- <resultMap id="extraResultMap" type="com.vci.ubcs.omd.entity.OmdAttribute">-->
-<!-- <result column="nullable" property="nullable" jdbcType="VARCHAR"/>-->
-<!-- <result column="max_length" property="maxLength" jdbcType="NUMBER"/>-->
-<!-- <result column="precision" property="precision" jdbcType="NUMBER"/>-->
-<!-- <result column="refer_to_id" property="referToId" jdbcType="NUMBER"/>-->
+ <resultMap id="extraResultMap" type="com.vci.ubcs.omd.entity.OmdAttribute">
+ <result column="nullable" property="nullable" jdbcType="VARCHAR"/>
+ <result column="max_length" property="maxLength" jdbcType="NUMERIC"/>
+ <result column="precision" property="precision" jdbcType="NUMERIC"/>
+ <result column="refer_to_id" property="referToId" jdbcType="NUMERIC"/>
<!-- <result column="refer_type" property="referType" jdbcType="VARCHAR"/>-->
-<!-- <result column="refer_to_name" property="referToName" jdbcType="VARCHAR"/>-->
+ <result column="refer_to_name" property="referToName" jdbcType="VARCHAR"/>
<!-- <result column="using_enum" property="usingEnum" jdbcType="VARCHAR"/>-->
<!-- <result column="enum_key" property="enumKey" jdbcType="VARCHAR"/>-->
<!-- <result column="enum_name" property="enumName" jdbcType="VARCHAR"/>-->
-<!-- <result column="default_value" property="defaultValue" jdbcType="VARCHAR"/>-->
-<!-- <result column="calculate_type" property="calculateType" jdbcType="VARCHAR"/>-->
-<!-- <result column="calculate_value" property="calculateValue" jdbcType="VARCHAR"/>-->
-<!-- </resultMap>-->
+ <result column="default_value" property="defaultValue" jdbcType="VARCHAR"/>
+ <result column="calculate_type" property="calculateType" jdbcType="VARCHAR"/>
+ <result column="calculate_value" property="calculateValue" jdbcType="VARCHAR"/>
+ </resultMap>
+
--
Gitblit v1.9.3