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

3 Commits

Author SHA1 Message Date
wangxin
8ce5a0f9af (1)修复导入common.js报错 
(2)app策略导入提交
 2018-10-19 22:07:16 +08:00
duandongmei
04833e917c Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into 
develop

Conflicts:
	src/main/webapp/WEB-INF/include/excel/importModal.jsp
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
增加region和service导入属性，动态控制导入业务
优化导入界面
 2018-10-19 17:19:52 +08:00
duandongmei
6880363d9a voip界面去掉无用的检索条件 
摘要文件类型增加音视频文件类
ip和http增加配置导出
 2018-10-15 10:14:01 +08:00