~nishiwei/ard-uav-server.git

forked from uav/ard-uav-server

zhaowenyu

2025-11-03 9bb52797002ee048968a43c37a33e58334aeb551

refs
author	zhaowenyu <35589726@qq.com>
	Monday, November 3, 2025 16:57 +0800
committer	zhaowenyu <35589726@qq.com>
	Monday, November 3, 2025 16:57 +0800
commit	9bb52797002ee048968a43c37a33e58334aeb551
tree	452432f1b806dc3ccf0acc27f0941028cda7a3f9 tree \| zip \| gz
parent	929bdcb35152ce74774a2abf8a3a8b5d8d9b7fa3 view \| diff defe580b123e1b7c892b88619c05774157dc09b5 view \| diff

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

5 files modified

	ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java	9 ●●●●● diff \| view \| raw \| blame \| history
	ard-device/src/main/java/com/ard/device/camera/mapper/ArdCameraMapper.java	2 ●●●●● diff \| view \| raw \| blame \| history
	ard-device/src/main/java/com/ard/device/camera/service/IArdCameraService.java	7 ●●●●● diff \| view \| raw \| blame \| history
	ard-device/src/main/java/com/ard/device/camera/service/impl/ArdCameraServiceImpl.java	17 ●●●●● diff \| view \| raw \| blame \| history
	ard-device/src/main/resources/mapper/ArdCameraMapper.xml	3 ●●●●● diff \| view \| raw \| blame \| history