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

maven

3 天以前 2a9c3934bb093c978a54a1c3e220e6a120855e77

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

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