Merge branch 'debug' of http://8.136.199.33:3000/eta_gn_server/eta_api into debug

models/system/sys_menu.go

@@ -170,7 +170,7 @@ func GetMenuListAllByRoleIds(roleIds string) (items []*MenuList, err error) {
 			INNER JOIN sys_role AS c ON b.role_id=c.role_id
 			WHERE c.role_id in (` + roleIds + `)
             AND a.menu_type=0
-            ORDER BY menu_id ASC `
+            ORDER BY sort ASC, menu_id ASC `
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }