Commit Graph

4 Commits

Author SHA1 Message Date
wangxin
2b78d3e8a2 补充policy_group_info没有提交的字段asn_no添加sql 2018-10-30 17:26:30 +08:00
duandongmei
a30d80e64e 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
	关键字日志转http url配置功能完成
2018-10-29 16:29:23 +08:00
wangxin
6855454715 packet ip asn下发时加入用户自定义域ASN_ID,config_group_info表新增字段asn_id 2018-10-25 19:05:07 +08:00
wangxin
097f5fc446 删除基本配置中的协议IP菜单 2018-10-25 14:12:29 +08:00