Merge branch 'master' into dev

# Conflicts: # report-ui/src/views/login.vue
3 years ago · 0c8328745c
parent 7c0b28ebd1 127f1c5890
commit 0c8328745c
1 changed files with 3 additions and 1 deletions
--- a/report-ui/src/views/report/report/index.vue
+++ b/report-ui/src/views/report/report/index.vue
@ -59,7 +59,9 @@ export default {
        buttons: {
          query: {
            api: reportList,
-            permission: "reportManage:query"
+            permission: "reportManage:query",
+            sort: 'update_time',
+            order: 'DESC'
          },
          queryByPrimarykey: {
            api: reportDetail,