Merge remote-tracking branch 'origin/master'

cuilei

6 天以前 bbbd9a413e668aa3e93b6bdd46d4b5113189bcbc

 src/views/base/modules/warehouse/WarehouseModel.vue

@@ -4,6 +4,7 @@
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    :maskClosable="false"
    :okButtonProps="{ props: {disabled: disableSubmit} }"
    @ok="handleOk"
    @cancel="handleCancel"