~nishiwei/ard-uav-server.git

forked from uav/ard-uav-server

zhaowenyu

2025-11-21 19144edf60036ad3b9a30b1b92e985de69231137

refs
author	zhaowenyu <35589726@qq.com>
	Friday, November 21, 2025 08:15 +0800
committer	zhaowenyu <35589726@qq.com>
	Friday, November 21, 2025 08:15 +0800
commit	19144edf60036ad3b9a30b1b92e985de69231137
tree	04a0878a9a15753f0a2524174956f0dff26d6b78 tree \| zip \| gz
parent	c0c839c0066269d6d7bab08b49fe379781be7617 view \| diff de50ed5e3c217d3f4c49fcfa95da156338f3b179 view \| diff

Merge remote-tracking branch 'origin/dev' into dev

3 files added

3 files modified

	ard-admin/src/main/resources/application-daqing-druid.yml	61 ●●●●● diff \| view \| raw \| blame \| history
	ard-admin/src/main/resources/application-daqing.yml	81 ●●●●● diff \| view \| raw \| blame \| history
	ard-admin/src/main/resources/application.yml	3 ●●●●● diff \| view \| raw \| blame \| history
	ard-work/pom.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java	175 ●●●●● diff \| view \| raw \| blame \| history
	ard-work/src/main/java/com/ard/work/util/osSelect.java	39 ●●●●● diff \| view \| raw \| blame \| history