kaiyu
2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1
refs
author kaiyu <404897439@qq.com>
Monday, December 7, 2020 10:50 +0800
committer kaiyu <404897439@qq.com>
Monday, December 7, 2020 10:50 +0800
commitcf42a18aba4da77141dd0ea65918444636f899e1
tree 25c086cdae1b4204222badc94a5e1211f324854a tree | zip | gz
parent 513d8719dd870fed4022dacc56be46353c33e7f4 view | diff
e294ea312fe1994c3ddfe26595ee414e6612eb0c view | diff
Merge remote-tracking branch 'origin/master'

# Conflicts:
# src/main/java/com/moral/controller/ScreenController.java
7 files added
5 files modified
214 ■■■■■ changed files
src/main/java/com/moral/controller/ScreenController.java 4 ●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/PollutionSourcePoint.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/HistoryFiveMinutelyMapper.java 1 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/PollutionSourcPointMapper.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/HistoryFiveMinutelyService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/PollutioSourcePointService.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryFiveMinutelyServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/PollutioSourcePointServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/util/EmissionDataUtil.java 27 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/util/WindUtils.java 88 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryFiveMinutelyMapper.xml 12 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/PollutionSourcePointMapper.xml 16 ●●●●● diff | view | raw | blame | history