TrackTogetherServiceImpl.java
11.6 KB
-
Merge remote-tracking branch 'origin/master' · e6eb618a
# Conflicts: # src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskMapper.java # src/main/java/com/founder/interservice/mapper/xzxt/TogetherTaskResultMapper.java # src/main/java/com/founder/interservice/regionalanalysis/service/RegionalAnalysisService.java # src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalAnalysisServiceImpl.java # src/main/java/com/founder/interservice/spatiotemporalBackTrack/controller/SpatiotemporalBackTrackController.java # src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/SpatiotemporalBackTrackService.java # src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/impl/SpatiotemporalBackTrackServiceImpl.java # src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java # src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java # src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java # src/main/resources/mybatis/mapper/xzxt/RegionalTaskMapper.xml # src/main/resources/mybatis/mapper/xzxt/SBTResultDetailMapper.xml # src/main/resources/mybatis/mapper/xzxt/TogetkerTaskResultMapper.xml
吴善钰 committed