gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,117 Commits 14 Branches 0 Tags
40bcfea6839ffbe9cff4beaa1426da83014919f9
Commit Graph

2 Commits

Author SHA1 Message Date
duandongmei
3e1d14602e 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
	excel导入提示信息补全，单个字典数据不需要导入
	去掉是否表达式的导入，根据关键词单个和多个区分
 2018-10-23 14:14:08 +08:00
duandongmei
85d127c000 字符串类导入模板定义 2018-10-18 10:13:34 +08:00