Merge branch 'master' into dev

# Conflicts:
#	report-ui/src/views/login.vue
This commit is contained in:
Raod
2021-08-17 10:45:11 +08:00

View File

@@ -59,7 +59,9 @@ export default {
buttons: {
query: {
api: reportList,
permission: "reportManage:query"
permission: "reportManage:query",
sort: 'update_time',
order: 'DESC'
},
queryByPrimarykey: {
api: reportDetail,