Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-27 15:55:58 +08:00
36 changed files with 3848 additions and 2158 deletions
@@ -2097,7 +2097,7 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
this.$http.delete("sarResource/ts-resource", {
this.$http.put("sarResource/ts-resource/delResourceById", {
resourceId: data.id
}, res => {
}, e => {