Merge remote-tracking branch 'origin/master'

xiejun

2023-12-14 77d0006d03513343e40108735540387e8f188ce4

 Source/UBCS-WEB/src/views/monitor/log/operateLog.vue

@@ -159,7 +159,7 @@
        }
        this.loading = true;
        listLogOperate(
          page.currentPage, 
          page.currentPage,
          page.pageSize,
          conditionMaps
        ).then(res => {