From 0e5a8aec6cdd998e1db7f5aa8e1b020f1c97573a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 30 五月 2024 11:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/UserDepartmentMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/UserDepartmentMapper.xml b/src/main/resources/mapper/UserDepartmentMapper.xml
index a2f68c8..9b9b637 100644
--- a/src/main/resources/mapper/UserDepartmentMapper.xml
+++ b/src/main/resources/mapper/UserDepartmentMapper.xml
@@ -7,13 +7,13 @@
<result column="department_id" jdbcType="INTEGER" property="departmentId" />
</resultMap>
<sql id="Base_Column_List">
- id, user_id, department_id
+ id, user_id, department_id, dept_admin
</sql>
<insert id="insert" parameterType="com.mindskip.xzs.domain.UserDepartment" useGeneratedKeys="true" keyProperty="id">
- insert into t_user_department (id, user_id, department_id
+ insert into t_user_department (id, user_id, department_id, dept_admin
)
- values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}
+ values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}, #{deptAdmin}
)
</insert>
--
Gitblit v1.8.0