~nishiwei/ard-uav-server.git

倪世伟 / ard-uav-server

forked from uav/ard-uav-server

summary
reflog
commits
tree
docs
forks
compare

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

zhaowenyu

2025-11-25 aae8b5dc994fffdc211b1f0fc860840cb0d4687a

 ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml

@@ -33,7 +33,7 @@
    </resultMap>

    <select id="selectArdServerInfo" resultType="com.ard.work.domain.entity.ArdServerInfo">
        select * from ard_server_info where id = #{serverId}
        select * from ard_server where id = #{serverId}
    </select>

    <sql id="selectArdDroneVo">

			@@ -33,7 +33,7 @@
			</resultMap>

			<select id="selectArdServerInfo" resultType="com.ard.work.domain.entity.ArdServerInfo">
			select * from ard_server_info where id = #{serverId}
			select * from ard_server where id = #{serverId}
			</select>

			<sql id="selectArdDroneVo">