d92544f7c4
# Conflicts: # detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java # detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java # detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java # detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java # detection/src/main/java/com/njcn/gather/report/utils/BookmarkUtil.java # detection/src/main/java/com/njcn/gather/report/utils/Docx4jUtil.java # detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java # entrance/src/main/resources/application.yml
CN_Gather
灿能的融合各工具的项目体