From 82d09815c5efb03d448d6a5b74a5cbfe85063ebc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
index 790d23b..644a479 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
@@ -5,26 +5,26 @@
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="ossResultMap" type="com.vci.ubcs.resource.entity.Oss">
         <result column="id" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
+        <result column="createuser" property="createUser"/>
+        <result column="createtime" property="createTime"/>
+        <result column="updateuser" property="updateUser"/>
+        <result column="updatetime" property="updateTime"/>
         <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="oss_code" property="ossCode"/>
+        <result column="isdeleted" property="isDeleted"/>
+        <result column="osscode" property="ossCode"/>
         <result column="category" property="category"/>
         <result column="endpoint" property="endpoint"/>
-        <result column="access_key" property="accessKey"/>
-        <result column="secret_key" property="secretKey"/>
-        <result column="bucket_name" property="bucketName"/>
-        <result column="app_id" property="appId"/>
+        <result column="accesskey" property="accessKey"/>
+        <result column="secretkey" property="secretKey"/>
+        <result column="bucketname" property="bucketName"/>
+        <result column="appid" property="appId"/>
         <result column="region" property="region"/>
         <result column="remark" property="remark"/>
     </resultMap>
 
 
     <select id="selectOssPage" resultMap="ossResultMap">
-        select * from pl_sys_oss where is_deleted = 0
+        select * from pl_sys_oss where isdeleted = 0
     </select>
 
 </mapper>

--
Gitblit v1.9.3