Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupNoticeMapper.xml

@@ -33,7 +33,7 @@
         </foreach>
     </insert>
     <select id="queryPage" resultMap="ImGroupNoticeDto">
-        SELECT gn.*,su.avatar_,su.real_name_ username_ FROM im_group_notice gn
+        SELECT gn.*,su.avatar_,su.username_ FROM im_group_notice gn
         LEFT JOIN sys_user su ON su.id_ = gn.operator_id_
         WHERE gn.group_id_ = #{params.groupId}
     </select>