Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

3 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

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

@@ -14,6 +14,9 @@
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
                 dr.acceptance_name,
                 dr.acceptance_time,
                 dr.acceptance_remark,
                dr.status,
                dr.create_time,
                dr.update_time,
@@ -60,6 +63,9 @@
               dr.maintenance_name,
               dr.maintenance_time,
               dr.maintenance_result,
               dr.acceptance_name,
               dr.acceptance_time,
               dr.acceptance_remark,
               dr.status,
               dr.create_time,
               dr.update_time,