parent: 8b5439 | patch | commitdiff
cjl
2023-10-10 495fad8166b5952c013aea275243cb9ee6e7fa2a
refs
author cjl <276999030@qq.com>
Tuesday, October 10, 2023 13:43 +0800
committer cjl <276999030@qq.com>
Tuesday, October 10, 2023 13:43 +0800
commit495fad8166b5952c013aea275243cb9ee6e7fa2a
tree 3b6c4c1df5f50755726d5ce7f5f3e224a961af4a tree | zip | gz
parent 8b5439ba2748f91720975f73e7479a751d6a452b view | diff
f0837ee21f7650d4413830d4ee90da02bcdd6d36 view | diff 
Merge remote-tracking branch 'origin/qa' into qa

# Conflicts:
#	screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
11 files modified
155 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java 36 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java 53 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-dev.yml 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/DeviceMapper.xml 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml 18 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml 4 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java 27 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java 1 ●●●●● diff | view | raw | blame | history