Merge branch 'main' into main-dev

648540858

2023-04-03 786c76ba714321c2d481b32afbb619a33f7c11a9

 web_src/src/components/dialog/changePushKey.vue

@@ -65,7 +65,7 @@
    onSubmit: function () {
      this.$axios({
        method: 'post',
        url:"/api/user/changePushKey",
        url:"./api/user/changePushKey",
        params: {
          pushKey: this.newPushKey,
          userId: this.form.id,