Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/resources/mapper/TabPushMessageMapper.xml

@@ -261,9 +261,9 @@
   <select id="pageUserMessage" resultMap="userMessageResult">
     select
       t1.classify,t1.title,t1.content,t1.message_id,t1.create_time,t1.status, t3.sign
-    from tab_push_user_message t1, tab_push_message t3
+    from tab_push_user_message t1 left join tab_push_message t3 on t1.message_id = t3.message_id
     where t1.user_id=#{userId}
-    and (t1.status = 1 or t1.status = 2) and t1.message_id=t3.message_id
+    and (t1.status = 1 or t1.status = 2)
     <if test="search != null and search != ''">
       and (t1.title like concat('%', #{search}, '%') or t1.content like concat('%', #{search}, '%'))
     </if>