Commit Graph

2 Commits

Author SHA1 Message Date
duandongmei
ab0ed9ce05 将策略分组、欺骗ip、dns策略、bgp、音视频文本、文件摘要、http内容替换业务Controller方法返回对象修改为redirectAttribute 2018-07-02 14:07:47 +08:00
duandongmei
20e38eb0e8 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.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
策略分组功能提交
2018-06-20 13:37:07 +08:00