forked from moral

parent: 8ec704 | patch | commitdiff
jinpengyong
2023-09-05 25a977a6408fe6ba20ddacf6f43bee2fe93eb17b
refs
author jinpengyong <jpy123456>
Tuesday, September 5, 2023 08:41 +0800
committer jinpengyong <jpy123456>
Tuesday, September 5, 2023 08:41 +0800
commit25a977a6408fe6ba20ddacf6f43bee2fe93eb17b
tree b13a5e67a9ba64653df16d04466a20ae6a622f3f tree | zip | gz
parent 8ec7046779aa7ae510cbb584fbaa87cc45cfc49b view | diff
649e91190c46cff44724c85e64ea2e4ec9eccba8 view | diff 
Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
8 files modified
66 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java 25 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/vo/HistoryHourlyVo.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/DeviceMapper.xml 4 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/PubController.java 20 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/DeviceService.java 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 10 ●●●●● diff | view | raw | blame | history