-
Administrator authored
# Conflicts: # pom.xml # src/main/java/com/yxproject/start/api/ShiroApi.java # src/main/java/com/yxproject/start/config/JerseyConfig.java # src/main/java/com/yxproject/start/entity/GroupinfoEntity.java # src/main/java/com/yxproject/start/entity/ProductionTaskListEntity.java # src/main/java/com/yxproject/start/mapper/GroupinfoMapper.java # src/main/java/com/yxproject/start/mapper/ProductionTaskListMapper.java # src/main/java/com/yxproject/start/service/ProductionTaskListService.java # src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java # src/main/resources/application.properties # src/main/resources/mapper/GroupinfoMapper.xml # src/main/resources/mapper/ProductionTaskListMapper.xml
02557039
