# Conflicts: # detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java