Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-06-13 c4d7dd9651e5dc004ab443ecd72da51c117a87c2

 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 {