From 45401ee9679d7855bf936d5ea2a7712cb54e57bb Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 15 Jun 2019 10:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=8F=8F=E8=BF=B0=E7=A9=BA=E4=B8=B2=E4=B8=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 +-
 sql/ry_20190601.sql                                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 610cdb3d..be2d3814 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
diff --git a/sql/ry_20190601.sql b/sql/ry_20190601.sql
index 196ad729..c83b2681 100644
--- a/sql/ry_20190601.sql
+++ b/sql/ry_20190601.sql
@@ -58,7 +58,7 @@ create table sys_user (
   create_time 	    datetime                                   comment '创建时间',
   update_by         varchar(64)     default ''                 comment '更新者',
   update_time       datetime                                   comment '更新时间',
-  remark 		    varchar(500) 	default '' 				   comment '备注',
+  remark 		    varchar(500) 	default null 			   comment '备注',
   primary key (user_id)
 ) engine=innodb auto_increment=100 comment = '用户信息表';