-
# Conflicts: # service/pom.xml # service/src/main/java/com/hitcs/manager/controller/ServiceController.java # service/src/main/java/com/hitcs/manager/entity/Service.java # service/src/main/java/com/hitcs/manager/entity/ServiceListArray.java # service/src/main/java/com/hitcs/manager/entity/ServiceState.java # service/src/main/java/com/hitcs/manager/service/DockerService.java # service/src/main/java/com/hitcs/manager/service/ServiceImpl.java # service/src/main/resources/mapping/ServiceMapping.xml # service/target/classes/com/hitcs/manager/controller/ServiceController.class # service/target/classes/com/hitcs/manager/entity/Service.class # service/target/classes/com/hitcs/manager/entity/ServiceList.class # service/target/classes/com/hitcs/manager/entity/ServiceListArray.class # service/target/classes/com/hitcs/manager/entity/ServiceListNode.class # service/target/classes/com/hitcs/manager/entity/ServiceState.class # service/target/classes/com/hitcs/manager/mapper/ServiceMapper.class # service/target/classes/com/hitcs/manager/service/ServiceImpl.class # service/target/classes/mapping/ServiceMapping.xml
7bc54c3e
