Merge branch 'develop'

zenglf

2023-10-31 769554d454e60374aa6b3a36c2ec7b284371134b

 src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue

@@ -343,7 +343,7 @@
      return "background-color:rgba(127, 127, 127,0.08)";
    },
    handleCancel() {
      this.$emit('ok');
      // this.$emit('ok');
      this.alterFlag = new Date();
      this.close()
    },