Commit Graph

4 Commits

Author SHA1 Message Date
duandongmei
c5130454f1 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

voip 和流媒体域与服务端表名更改
国际化文件增加voip和流媒体域描述
2018-10-11 19:40:01 +08:00
leijun
97a06a9874 VoIP ip配置修改 2018-10-11 18:33:23 +08:00
wangxin
653b56f5c6 bgp日志type字段换成字典取值,as字段换成asNum 2018-10-10 16:55:34 +08:00
Administrator
1f93df146c 1.提交修改数据库keywords长度2048,cfg_desc长度128,district长度128
2.专项任务表单增加长度限制
3.关键字长度增加限制
4.实时报表来函列表过长省略
2018-10-10 15:08:04 +08:00