Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

9 天以前 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67

 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,