~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

Xiajijian

2025-10-13 77ae6ed9a1a800bab0d048a6453d383ec35a54b9

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

@@ -39,6 +39,7 @@
        <include refid="selectArdServerManagementVo"/>
        <where>  
            <if test="serverName != null  and serverName != ''"> and server_name like concat('%', #{serverName}, '%')</if>
            <if test="host != null  and host != ''"> and host = #{host}</if>
        </where>
    </select>

			@@ -39,6 +39,7 @@
			<include refid="selectArdServerManagementVo"/>
			<where>
			<if test="serverName != null and serverName != ''"> and server_name like concat('%', #{serverName}, '%')</if>
			<if test="host != null and host != ''"> and host = #{host}</if>
			</where>
			</select>