log配置中添加master环境；查询人员信息时返回fs_user_id

src/main/resources/logback-spring.xml

@@ -15,7 +15,7 @@
         <property name="LOG_PATH" value="./logs/${APP_NAME}" />
     </springProfile>
 
-    <springProfile name="qa,live">
+    <springProfile name="qa,live,master">
         <property name="LOG_PATH" value="/var/logs/sfa/${APP_NAME}" />
     </springProfile>
 

src/main/resources/mapper/system/SysUserMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"       column="dept_id"      />
         <result property="userName"     column="user_name"    />
         <result property="nickName"     column="nick_name"    />
+        <result property="fsUserId"     column="fs_user_id"    />
         <result property="email"        column="email"        />
         <result property="phonenumber"  column="phonenumber"  />
         <result property="sex"          column="sex"          />
@@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 <!--	u.role_id,u.role_name,-->
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name,u.password, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.fs_user_id,u.password, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
                u.post_id,u.post_name,u.rule_id,u.rule_name,u.work_province_num,u.work_province_name,u.work_city_num,u.work_city_name,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status