guoshilong
2023-11-13 2caa210098644f51ff46daa33b87ce4b7f862a91
refs
author guoshilong <123456>
Monday, November 13, 2023 10:12 +0800
committer guoshilong <123456>
Monday, November 13, 2023 10:12 +0800
commit2caa210098644f51ff46daa33b87ce4b7f862a91
tree 6229b81e781306f9218d973b510069fa818713e2 tree | zip | gz
parent cbf5045d84088891ef0696b189e1f8af6a653bad view | diff
2b35b23f53cde5e76a9cc7d0c6a027335bd59f9a view | diff
Merge remote-tracking branch 'origin/htxx_dev' into htxx_dev

# Conflicts:
# src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
# src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
# src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
18 files modified
4 files added
299 ■■■■■ changed files
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java 4 ●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/manage/service/ILiveStreamService.java 2 ●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java 3 ●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/controller/FileController.java 10 ●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/controller/MediaController.java 22 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/dao/IFileMapper.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/dao/IFileMapper.xml 53 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/model/MediaFileEntity.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/model/MediaJobDTO.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/model/param/SearchMediaParam.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/service/IMediaService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java 26 ●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java 24 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/model/dto/WaylineJobCountDTO.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/model/dto/WaylineListDTO.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/model/entity/WaylineJobEntity.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java 28 ●●●●● diff | view | raw | blame | history