Merge remote-tracking branch 'origin/master_csy' into 企微聊天

fs-service/src/main/resources/mapper/system/SysUserMapper.xml

@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
- 			<if test="companyId != null">company_id = #{companyId},</if>
+ 			company_id = #{companyId},
  			<if test="unionId != null">union_id = #{unionId},</if>
  			update_time = sysdate()
  		</set>