From ea9a04fe8ae638765e174a382c5df419aa63d42e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 四月 2024 14:22:27 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV

---
 pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index cfc729f..b722404 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -8,6 +8,7 @@
     <result column="name" property="name" />
     <result column="disabled" property="disabled" />
     <result column="deleted" property="deleted" />
+    <result column="create_dt" property="createDt" />
   </resultMap>
   <resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
     <result column="id" property="id" />
@@ -15,17 +16,17 @@
   </resultMap>
 
   <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
-    <collection property="priIds" ofType="java.lang.String" fetchType="eager" column="{roleId=id}" select="com.dy.pmsGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />
+    <collection property="priIds" ofType="java.lang.Integer" fetchType="eager" column="{roleId=id}" select="com.dy.pmsGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />
   </resultMap>
 
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, `name`, disabled, deleted
+    id, `name`, disabled, deleted,create_dt
   </sql>
 
   <sql id="Part_Column_List">
     <!--@mbg.generated-->
-    id, `name`, disabled
+    id, `name`, disabled,create_dt
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="someResultMap">

--
Gitblit v1.8.0