fengxiang
2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41
refs
author fengxiang <110431245@qq.com>
Thursday, July 12, 2018 16:07 +0800
committer fengxiang <110431245@qq.com>
Thursday, July 12, 2018 16:07 +0800
commit6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41
tree 4d2f73ae8fc07882ddc5c2cee1ea23ffe865a4e1 tree | zip | gz
parent d8ea4e728d8421a5ed0bad3486626d2b43b1333d view | diff
b5ee321e0afc4c69e48a271c79cfd98c78da9f91 view | diff
Merge remote-tracking branch 'origin/master'
3 files added
12 files modified
224 ■■■■■ changed files
src/main/java/com/moral/controller/DemoConreoller.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/MobileController.java 91 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java 9 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/DemoMapper.java 4 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/DeviceMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/HistoryMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/SensorMapper.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/HistoryService.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/AccountServiceImpl.java 3 ●●●●● 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/HistoryServiceImpl.java 41 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/DemoMapper.xml 4 ●●●● diff | view | raw | blame | history
src/main/resources/mapper/DeviceMapper.xml 30 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryMapper.xml 13 ●●●●● diff | view | raw | blame | history