parent: 56eaf2 | patch | commitdiff
cjl
2023-09-01 979166aaa979629bf223a44a46aeb6d0c0e61aec
refs
author cjl <276999030@qq.com>
Friday, September 1, 2023 16:32 +0800
committer cjl <276999030@qq.com>
Friday, September 1, 2023 16:32 +0800
commit979166aaa979629bf223a44a46aeb6d0c0e61aec
tree ba04db4ede2531b440106f2c9e27a6bf38171b8e tree | zip | gz
parent 56eaf2d9ad4b5157d080ee76e2d2a925de60b83f view | diff
b2d11985e1cdd932deed8e2fb5749d6adf6afbdb view | diff 
Merge remote-tracking branch 'origin/cjl' into qa
5 files modified
34 ■■■■■ 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