parent: a97c42 | patch | commitdiff
jinpengyong
2023-08-24 9655ea9ce8cdd671a766f87a0885b0fdff7b89c9
refs
author jinpengyong <jpy123456>
Thursday, August 24, 2023 17:12 +0800
committer jinpengyong <jpy123456>
Thursday, August 24, 2023 17:12 +0800
commit9655ea9ce8cdd671a766f87a0885b0fdff7b89c9
tree e327e0c5b83426c5a2e0582754c967c0499a9f37 tree | zip | gz
parent a97c42ad398252b9b69cabc3494a45a79064eec8 view | diff
b1bfa089b5b299c1c3c71094e450748a5e5e8a75 view | diff 
Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

 Conflicts:
	screen-manage/src/main/java/com/moral/api/controller/TestController.java
1 files added
7 files modified
225 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/config/Interceptor/CorsConfig.java 51 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTO.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java 58 ●●●●● 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