forked from moral

parent: 8228b0 | patch | commitdiff
jinpengyong
2022-03-09 5fa4c1db3141099be4ca176cdf2f3ec10f46c141
refs
author jinpengyong <jpy123456>
Wednesday, March 9, 2022 11:36 +0800
committer jinpengyong <jpy123456>
Wednesday, March 9, 2022 11:36 +0800
commit5fa4c1db3141099be4ca176cdf2f3ec10f46c141
tree a47115f4f37d8ecc1a1ce1a76608ea587e135b49 tree | zip | gz
parent 8228b06f808840d95d58e4ad457e072800af33e6 view | diff
997353a844c1d10ab930cbcd95922640063535f0 view | diff 
Merge remote-tracking branch 'origin/dev' into dev_

# Conflicts:
#	screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java
2 files modified
26 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java 21 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java 5 ●●●●● diff | view | raw | blame | history