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

yuan

17 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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

@@ -14,7 +14,6 @@
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
                dr.maintenance_price,
                dr.status,
                dr.create_time,
                dr.update_time,
@@ -60,7 +59,6 @@
               dr.maintenance_name,
               dr.maintenance_time,
               dr.maintenance_result,
               dr.maintenance_price,
               dr.status,
               dr.create_time,
               dr.update_time,