Merge remote-tracking branch 'origin/master'

田源

2023-10-13 2a4b9941ffa8b38557af281e95faf5cd8bb799e2

 Source/UBCS-WEB/src/views/report/reportlist.vue

@@ -68,6 +68,7 @@
      option: {
        height: 'auto',
        calcHeight: 30,
        columnBtn:false,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,