5 Commits

Author	SHA1	Message	Date
zhanghongqing	64532a60a5	ip管控白名单，发件人管控国际化	2018-03-07 13:42:18 +08:00
wangxin	b21c159fdd	Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop ... Conflicts: src/main/java/com/nis/domain/Page.java src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp	2018-03-06 18:54:04 +08:00
zhanghongqing	6d49f64a33	配置管理》管控白名单》IP管控白名单》国际化处理	2018-03-06 18:22:50 +08:00
wangxin	ec4f2a8da6	解决冲突	2018-03-06 18:14:45 +08:00
wangxin	c4a0169939	（1）数值类配置dao,service,controller提交 ... （2）增强字符串类配置dao,service,controller,页面提交	2018-02-28 12:15:52 +08:00