parent: 74c430 | patch | commitdiff
cjl
2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000
refs
author cjl <276999030@qq.com>
Wednesday, November 1, 2023 16:21 +0800
committer cjl <276999030@qq.com>
Wednesday, November 1, 2023 16:21 +0800
commit856f1cf8ee52443ce616ce00ecff7cbb7c30f000
tree 6365792c54c558fd10e1b4ce491c6622e0e37957 tree | zip | gz
parent 74c430e012ade8363b57949357e3cf653b944a2d view | diff
8ef8f346231992fbbdae8a4eff5f7feb467616a2 view | diff 
Merge remote-tracking branch 'origin/cjl' into dev

# Conflicts:
#	screen-api/src/main/java/com/moral/api/controller/CruiserController.java
1 files added
13 files modified
596 ■■■■■ changed files
screen-api/pom.xml 7 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/CruiserController.java 101 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UAVController.java 13 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVGetBD.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java 121 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultListDTO.java 34 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UAVService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UAVServiceImpl.java 276 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml 8 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/controller/PubController.java 9 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-dev.yml 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 2 ●●●●● diff | view | raw | blame | history