From f3c411d4ddc5d1ebf7414103b1bc0d09b929c413 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 四月 2023 10:37:58 +0800
Subject: [PATCH] 联调修改codebasic，以及代码合并
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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 a7f1891..078fbe1 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
@@ -5,35 +5,35 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="baseResultMap" type="com.vci.ubcs.omd.entity.OmdAttribute">
<id column="id" property="id"/>
- <result column="create_user" property="createUser" jdbcType="NUMBER"/>
- <result column="create_dept" property="createDept" jdbcType="NUMBER"/>
- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
- <result column="update_user" property="updateUser" jdbcType="NUMBER"/>
- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
- <result column="status" property="status" jdbcType="NUMBER"/>
- <result column="is_deleted" property="isDeleted" jdbcType="NUMBER"/>
- <result column="tenant_id" property="tenantId" jdbcType="NUMBER"/>
- <result column="key" property="key" jdbcType="VARCHAR"/>
- <result column="label" property="label" jdbcType="VARCHAR"/>
- <result column="type" property="type" jdbcType="VARCHAR"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_dept" property="createDept"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
+ <result column="is_deleted" property="isDeleted"/>
+ <result column="tenant_id" property="tenantId"/>
+ <result column="key" property="key"/>
+ <result column="label" property="label"/>
+<!-- <result column="type" property="type"/>-->
<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"/>
- <result column="refer_type" property="referType" 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>
+<!-- <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"/>-->
+<!-- <result column="refer_type" property="referType" 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>-->
--
Gitblit v1.9.3