Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd

 web_src/src/components/dialog/changePasswordForAdmin.vue

old mode 100644
new mode 100755
@@ -85,7 +85,7 @@
    onSubmit: function () {
      this.$axios({
        method: 'post',
        url:"./api/user/changePasswordForAdmin",
        url:"/api/user/changePasswordForAdmin",
        params: {
          password: this.newPassword,
          userId: this.form.id,