Merge remote-tracking branch 'origin/develop_master' into develop_1

2021-07-29 15:19:39 +08:00
parent 0779f2c8e9 60dbb8faeb
commit 9d3d8e1198
32 changed files with 862 additions and 83 deletions
@@ -15,6 +15,8 @@
        <result column="remarks" property="remarks" />
    </resultMap>

+
+
    <!-- SAR_MENU table all fields -->
    <sql id="Base_Column_List" >
     parent_id, menu_name, sor_divide, id, modify_time, creation_time, valid_flag, display_seq, parent_ids, remarks
@@ -69,6 +71,12 @@
        </trim>
    </sql>

+
+    <insert id="insertTsRoleResource" parameterType="java.util.Map">
+        INSERT INTO ts_role_resource
+        VALUES(#{roleId},#{resourceId} )
+    </insert>
+
    <!-- 插入记录 -->
    <insert id="insert" parameterType="com.adc.da.slrs.sarResource.entity.TsResource" >
        <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">