Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

‘sxh’

2023-06-15 652489b47ef582b3f492039ab7fd58c558c1ba36

 web_src/src/components/dialog/catalogEdit.vue

@@ -118,8 +118,7 @@
        method:"post",
        url:`/api/platform/catalog/${!this.isEdit? "add":"edit"}`,
        data: this.form
      })
        .then((res)=> {
      }).then((res)=> {
          if (res.data.code === 0) {
            if (this.submitCallback)this.submitCallback(this.form)
          }else {