Merge remote-tracking branch 'origin/master'

cuilei

4 天以前 8b6b7aa7e4f2ae6ec14514875b559aa6890f3b1e

 src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue

@@ -274,13 +274,6 @@
              align: 'center'
            },
            {
              title: '子保养项',
              key: 'subItemName',
              type: JVXETypes.normal,
              width: '10%',
              align: 'center'
            },
            {
              title: '保养要求',
              key: 'itemDemand',
              type: JVXETypes.normal,