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

maven

2 天以前 7f9b99a28cd983fa55b5788519682e4794cf6cb0

 src/views/equipmentManagement/ledger/Modal.vue

@@ -48,8 +48,8 @@
};

const close = () => {
  closeModal();
  formRef.value.resetForm();
  closeModal();
};

const loadForm = async (id) => {