工业级后台API v2
parent: 259294 | patch | commitdiff
fengxiang
2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677
refs
author fengxiang <110431245@qq.com>
Monday, February 5, 2018 15:07 +0800
committer fengxiang <110431245@qq.com>
Monday, February 5, 2018 15:07 +0800
commitf1e25082a58c8cb57dd45d226d3a94f4af4a0677
tree 78b708621298a1fa05108f2c043f5bfad52e3122 tree | zip | gz
parent 259294a3a1f922188075ad6ddad502eca5886b07 view | diff
48bfa4e57cd2195b86bd8c0debe2e241db0ba80d view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/moral/controller/ScreenController.java
3 files modified
110 ■■■■■ changed files
src/main/java/com/moral/controller/ReportController.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/HistoryMinutelyService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java 106 ●●●●● diff | view | raw | blame | history