Merge branch 'develop'

qushaowei

2023-11-22 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681

 src/views/system/WorkshopSignageManagement.vue

@@ -230,6 +230,11 @@
          scopedSlots: { customRender: 'backgroundImage' },
        },
        {
          title: '设备编号颜色',
          dataIndex: 'equipmentIdColor',
          align: 'center',
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',