Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/hpmessage/mapper/xml/HpMessageMapper.xml

@@ -185,7 +185,8 @@
 		a.message_time AS "messageTime",
 		a.content AS "content",
 		a.type AS "type",
-		a.is_read AS "isRead"
+		a.is_read AS "isRead",
+		hm.real_name as "hpMember.realName"
 		FROM hp_message a
 		<include refid="hpMessageJoins"/>
 		<where>