Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!845

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="remark"       column="remark"       />
 		<result property="gzhOpenId"       column="gzh_open_id"       />
 		<result property="openId"       column="open_id"       />
+		<result property="msdqOpenId"       column="msdq_open_id"       />
 		<result property="aliuserId"       column="aliuser_id"       />
 		<result property="channelOpenId"       column="channel_open_id"       />
 		<result property="unionId"       column="union_id"       />