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

src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java

@@ -131,7 +131,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		//查询时left join policyGroup
 		Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(new Page<IpMultiplexPoolCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model,entity);
+		initFormCondition(model,entity);
 		return "/cfg/maintenance/ipMultiplexPool/snatlist";
 	}