# Conflicts: # src/main/java/com/aps/service/Algorithm/GeneticDecoder.java # src/main/java/com/aps/service/plan/PlanResultService.java # src/test/java/com/aps/demo/PlanResultServiceTest.java