forked from moral

parent: 06b496 | patch | commitdiff
jinpengyong
2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75
refs
author jinpengyong <jpy123456>
Wednesday, August 23, 2023 15:35 +0800
committer jinpengyong <jpy123456>
Wednesday, August 23, 2023 15:35 +0800
commitb1bfa089b5b299c1c3c71094e450748a5e5e8a75
tree 4c594205174ba341e88d79ca26271a7aff1681ab tree | zip | gz
parent 06b49617f43d36220649e81a7e4ac912356fd1b4 view | diff
8c741905bff160816524a54df00a4acca684b770 view | diff 
Merge remote-tracking branch 'origin/wb_21' into dev
5 files modified
117 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/TestController.java 10 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java 16 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java 68 ●●●●● diff | view | raw | blame | history