Merge remote-tracking branch 'origin/master'

liuguocan

2023-11-28 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636

 admin-web/src/components/myTable/myTableV2.vue

@@ -365,7 +365,7 @@
       */
    search(param) {
      this.$nextTick(() => {
        // this.myTable.loading = true
        this.myTable.loading = true
        const params = Object.assign({}, this.filter)
        if(this.myTable.paging.show){
          params.pageSize = this.myTable.paging.page.pageSize
@@ -628,6 +628,8 @@
  color: #303133;
  font-weight: 700;
  margin-top: 10px;
  display: flex;
  justify-content: flex-end;
}
.el-radio {
  margin-right: 10px;