Merge branch 'feature/gn_edb' into dm

models/data_manage/edb_collect.go

@@ -229,7 +229,7 @@ MAX(b."modify_time") "modify_time"
  FROM edb_collect AS a JOIN edb_info AS b ON a.edb_info_id = b.edb_info_id
 	  WHERE 1=1 %s
 	  GROUP BY b.edb_info_id
-ORDER BY a.sort ASC, collect_time DESC LIMIT ?,?`, condition)
+ORDER BY collect_time DESC LIMIT ?,?`, condition)
 	pars = append(pars, startSize, pageSize)
 	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 	return