Commit Graph

6 Commits

Author SHA1 Message Date
duandongmei
6fb3d05a92 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	
	业务配置的list和form的标题取自菜单的国际化code;
	修改dns ssl P2P mail ftp无subscribe时,无预配置也可提交的bug
2018-10-04 13:13:00 +08:00
leijun
9db2e73d04 新增界面去除title 2018-09-29 21:12:47 +08:00
zhangwenqing
5f93a39d3f 解决配置新增界面取消按钮跳转问题. 2018-08-27 16:31:42 +08:00
duandongmei
91b43dd022 <!---->注释修改为<%----%> 2018-07-30 14:49:46 +08:00
duandongmei
6960e1528e 导出数据方法setDataList增加国际化配置参数
修改所有字典展示取值itemDesc为itemValue
2018-06-13 16:29:11 +08:00
zhangwei
fb67b37193 增加httpClien公共类 2018-05-21 09:46:49 +08:00