Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430 into de...

qushaowei

2023-12-12 6b24c28ba8a418c1efb46ed0576c9d6c3f5ab82c

 src/views/eam/modules/equipmentNew/edit/WarrantyUpdateTable.vue

@@ -85,7 +85,7 @@
              disabled:true,
              align:'center',
              defaultValue:'',
              

            },
            {
              title: '设备名称',
@@ -148,7 +148,7 @@
              align:'center',
            },
            {
              title: '质保结束日期（旧）',
              title: '质保结束日期（新）',
              key: 'newEnd',
              type: JVXETypes.date,
              width:"200px",