forked from uav/ard-uav-server
parent: ff745c | patch | commitdiff
zhaowenyu
2025-11-27 112575460343cd47e509754887fc06e256f5a5e5
refs
author zhaowenyu <35589726@qq.com>
Thursday, November 27, 2025 10:14 +0800
committer zhaowenyu <35589726@qq.com>
Thursday, November 27, 2025 10:14 +0800
commit112575460343cd47e509754887fc06e256f5a5e5
tree f8812cc428017773a617d74e2f670002007d971f tree | zip | gz
parent ff745c4957b7d5e345d7d9ecdee5e3e8f803d5ae view | diff
9d81f6179a527eeef8ba9b567ed06e01b70ed062 view | diff 
Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev

# Conflicts:
#	ard-admin/src/main/resources/application-prod.yml
3 files modified
22 ■■■■■ changed files
ard-admin/src/main/resources/application-prod.yml 14 ●●●●● diff | view | raw | blame | history
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java 4 ●●●●● diff | view | raw | blame | history
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java 4 ●●●●● diff | view | raw | blame | history