Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 d7557c1681b2da87df6509b3faf5dc4cefac1da2

 src/views/warehouseManage/bussinessType/AddBussinessType.vue

@@ -294,6 +294,9 @@
        this.showButton = false
        this.showEdit = false
        this.showFooter = true
      } else if (this.editConfig.title === "编辑") {
        this.showEdit = false
        this.showFooter = true
      } else {
        this.showEdit = true
        this.showFooter = false