From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/resources/mapper/AccountRoleMapper.xml | 28 ----------------------------
1 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/mapper/AccountRoleMapper.xml b/src/main/resources/mapper/AccountRoleMapper.xml
index d7a7c32..5f537d3 100644
--- a/src/main/resources/mapper/AccountRoleMapper.xml
+++ b/src/main/resources/mapper/AccountRoleMapper.xml
@@ -49,32 +49,4 @@
</where>
</sql>
- <select id="getAccountRoleList" resultMap="BaseResultMap">
- select
- ar.*,
- a.account_name,
- r.role_name
- from account_role ar
- left join account a on ar.account_id = a.id
- left join role r on ar.role_id = r.id
- <if test="_parameter != null">
- <include refid="Example_Where_Clause"/>
- </if>
- <if test="orderByClause != null">
- order by ${orderByClause}
- </if>
- </select>
-
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.AccountRole" >
- update account_role
- set account_id = #{accountId,jdbcType=INTEGER},
- role_id = #{roleId,jdbcType=INTEGER}
- where id = #{id,jdbcType=INTEGER}
- </update>
-
- <delete id="deleteByPrimaryKeyOwn" parameterType="java.lang.Integer" >
- delete from account_role
- where id = #{id,jdbcType=INTEGER}
- </delete>
-
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0