Merge remote-tracking branch 'origin/master'

648540858

2024-03-13 f7e5fff44623eb0a01b1bc0f9a2e98d329e61a37

 web_src/src/components/UserManager.vue

old mode 100644
new mode 100755
@@ -99,7 +99,7 @@
      this.getUserListLoading = true;
      this.$axios({
        method: 'get',
        url: `./api/user/users`,
        url: `/api/user/users`,
        params: {
          page: that.currentPage,
          count: that.count
@@ -141,7 +141,7 @@
      }).then(() => {
        this.$axios({
          method: 'delete',
          url: `./api/user/delete?id=${row.id}`
          url: `/api/user/delete?id=${row.id}`
        }).then((res) => {
          this.getUserList();
        }).catch((error) => {