forked from moral

parent: 8aad04 | patch | commitdiff
jinpengyong
2023-10-13 bb6856a82a588f05040b0410a9747ae8029bb3be
refs
author jinpengyong <jpy123456>
Friday, October 13, 2023 10:06 +0800
committer jinpengyong <jpy123456>
Friday, October 13, 2023 10:06 +0800
commitbb6856a82a588f05040b0410a9747ae8029bb3be
tree 2465ae0ce53d9b027599125e8909ecf4440af2c6 tree | zip | gz
parent 8aad04b9b89a36c9b3fbd88aadbc192374a23a47 view | diff
2c8ca9db2471c33943c20882061a2c87bb99d7f0 view | diff 
Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

 Conflicts:
	screen-job/src/main/java/com/moral/api/controller/PubController.java
1 files added
14 files modified
301 ■■■■■ changed files
screen-job/src/main/java/com/moral/api/entity/Device.java 21 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/Sensor.java 23 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/Version.java 68 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 104 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-cjl.yml 12 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-dev.yml 3 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-qa.yml 3 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml 16 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/Device.java 1 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java 25 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-cjl.yml 3 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 3 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-qa.yml 4 ●●●●● diff | view | raw | blame | history