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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/CommonMQDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+public class CommonMQDTO implements Serializable {
+    
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -5681421708810402425L;
+    
+    private int type ;
+    private String params ;
+    public int getType() {
+        return type;
+    }
+    public String getParams() {
+        return params;
+    }
+    public void setType(int type) {
+        this.type = type;
+    }
+    public void setParams(String params) {
+        this.params = params;
+    }
+}

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml

@@ -126,7 +126,7 @@
   	<if test="null != linkType">
   		and link_type = #{linkType}
   	</if>
-  	and status_flag = 1
+  	and status_flag = 1 order by create_time desc
   	limit 20
   </select>
 
@@ -144,7 +144,7 @@
   	<if test="null != linkType">
   		and link_type = #{linkType}
   	</if>
-  	and status_flag = 1
+  	and status_flag = 1 order by create_time desc
   </select>
 
     <select id="queryPageRelationList" resultMap="result-map-tabHaobanHmLink">