Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

17 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -18,6 +18,7 @@
        dm.update_user,
        dm.tenant_id,
        dm.maintenance_actually_name,
        dm.remark,
        dl.device_name,
        dl.device_model,
        su.nick_name as create_user_name
@@ -63,6 +64,7 @@
               dm.update_user,
               dm.tenant_id,
               dm.maintenance_actually_name,
               dm.remark,
               dl.device_name,
               dl.device_model,
               su.user_name as create_user_name