Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
DuanDongmei
2018-11-29 10:42:39 +08:00
10 changed files with 964 additions and 10 deletions

View File

@@ -33,4 +33,6 @@ public interface IpAddrPoolCfgDao extends CrudDao<IpAddrPoolCfgDao>{
IpAddrPoolCfg getCfgInfo(IpAddrPoolCfg cfg);
List<IpAddrPoolCfg> findAddrPoolCfg();
}

View File

@@ -439,4 +439,10 @@
</if>
</trim>
</select>
<select id="findAddrPoolCfg" resultMap="addrPoolMap">
SELECT
<include refid="addrPoolColumns"/>,r.ADDR_POOL_NAME
FROM ip_reuse_addr_pool r WHERE r.is_valid !=-1
</select>
</mapper>