Merge branch 'master' into dev

# Conflicts:
#	report-ui/src/views/login.vue

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,