This repository has been archived on 2025-09-14. You can view files and clone it, but cannot push or open issues or pull requests.

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

..

nis

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

2018-10-04 13:13:00 +08:00