Merge remote-tracking branch 'origin/master'

zss

2024-03-11 d12fe5cd34a4ac05a7e8e40a4ee1cf2e69dc75e0

 src/views/basic/warehouse/warehouse-form.vue

@@ -322,6 +322,9 @@
              this.visible = false
              this.isSubmit = false
              this.$emit('refreshDataList')
            }).catch(error=>{
              console.error(error);
              this.isSubmit = false
            })
          } else {
            addObj(this.dataForm).then((data) => {
@@ -329,6 +332,9 @@
              this.visible = false
              this.isSubmit = false
              this.$emit('refreshDataList')
            }).catch(error=>{
              console.error(error);
              this.isSubmit = false
            })
          }
        } else {