fengxiang
2018-05-15 8efcc21de04bd7f7d784dac97e86e76e1a3ab930
refs
author fengxiang <110431245@qq.com>
Tuesday, May 15, 2018 10:47 +0800
committer fengxiang <110431245@qq.com>
Tuesday, May 15, 2018 10:47 +0800
commit8efcc21de04bd7f7d784dac97e86e76e1a3ab930
tree b12c7b69e8b89f0914882dc1c01b4da65a1eca5f tree | zip | gz
parent 781c9724dac7d3698161ecb845e55ba1800b8ec1 view | diff
b25fef7e301ad5bd947dc213d2f4455f434139f5 view | diff
Merge remote-tracking branch 'origin/master'
9 files modified
68 ■■■■■ changed files
src/main/java/com/moral/controller/DeviceController.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/DeviceMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/DeviceService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java 7 ●●●● diff | view | raw | blame | history
src/main/resources/mapper/AlarmDailyMapper.xml 3 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/DeviceMapper.xml 32 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryMinutelyMapper.xml 3 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/SensorMapper.xml 3 ●●●●● diff | view | raw | blame | history