Merge remote-tracking branch 'origin/meiteng' into zql

# Conflicts:
#	sql/edu_modify_table.sql

sql/edu_modify_table.sql

-# 修改 blesson value 19-12-10
+-- 修改 blesson value 19-12-10
 ALTER table b_lesson modify column value_consume VARCHAR (16);
 ALTER table b_lesson modify column value_gain VARCHAR (16);
-# 修改 b_person_value value 19-12-10
+
+-- 修改 b_person_value value 19-12-10
 ALTER table b_person_value modify column `value` VARCHAR (16);
-# 修改 b_release_value value 19-12-10
+
+-- 修改 b_release_value value 19-12-10
 ALTER table b_release_value modify column lesson_value VARCHAR (16);
 ALTER table b_release_value modify column train_value VARCHAR (16);
 
-# 添加b_person_value 中 lessonId 字段 19-12-11
+-- 添加b_person_value 中 lessonId 字段 19-12-11
 alter table b_person_value add lesson_id varchar(64) COMMENT '课程或培训id' after type;
 
-
-# -------------测试环境已更新--------------
+# -------------其他环境已更新--------------
 
 -- 修改个人积分表中 备注字段类型  19-12-17 11:04
 alter table b_person_value modify column `remarks` text;
+
 -- 修改banner表中 外链字段类型  19-12-17 19:14
 alter table b_banner modify column `external_url`  VARCHAR (2000);
+
 -- 修改外链表中 外链字段类型  19-12-17 19:14
 alter table b_external_link modify column `external_url`  VARCHAR (2000);
--- 收藏表增加收藏时间  19-12-17 19:14
-ALTER TABLE b_collect ADD `collect_date` datetime  COMMENT '收藏时间' ;
 
-# -------------测试环境已更新--------------
 -- 收藏表增加收藏时间  19-12-17 19:14
 ALTER TABLE b_collect ADD `collect_date` datetime  COMMENT '收藏时间' ;
+
+# -------------其他环境已更新---------------
+
+-- 修改外链表中 备注字段类型  19-12-18 09:56
+alter table b_external_link modify column `remarks`  VARCHAR (500);

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -67,7 +67,7 @@ public class SysUserController extends PaginationController<SysUser> {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                "同步"+line+"条人员信息");
+                line);
 
     }