~liusuyi/ruoyi-api.git

forked from ard/ruoyi-api

aijinhui

2023-09-26 f6d7a3f65aea500a275fa5f3f4325730bff16ade

refs
author	aijinhui <aijinhui>
	Tuesday, September 26, 2023 09:35 +0800
committer	aijinhui <aijinhui>
	Tuesday, September 26, 2023 09:35 +0800
commit	f6d7a3f65aea500a275fa5f3f4325730bff16ade
tree	e878b43a24eaccb680fea1626f92759766639f26 tree \| zip \| gz
parent	39a88b3fd870ad8a65f356561b42d465c4f2fc42 view \| diff cd37af890600186215fd53c0d419c89c562e3e70 view \| diff

Merge remote-tracking branch 'origin/master'

4 files modified

	ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java	4 ●●●●● diff \| view \| raw \| blame \| history
	ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java	2 ●●●●● diff \| view \| raw \| blame \| history
	ard-work/src/main/resources/templates/preview.html	2 ●●●●● diff \| view \| raw \| blame \| history
	ruoyi-admin/pom.xml	40 ●●●●● diff \| view \| raw \| blame \| history