13405411873 a0675bb828 Merge branch 'dev' ... # Conflicts: # dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java # dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionWorkNodeMapper.java # dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java # dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java # dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java # yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml		2024-11-11 18:19:46 +08:00
..
controller	Merge branch 'master' into dev	2024-10-21 18:03:53 +08:00
entity	识别代办	2024-10-17 17:18:17 +08:00
mapper	识别代办	2024-10-17 17:18:17 +08:00
service	Merge branch 'dev'	2024-11-11 18:19:46 +08:00