gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
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配置功能完成
This commit is contained in:
duandongmei
2018-10-29 16:29:23 +08:00
parent 65ba7f2d7a 27575259a8
commit a30d80e64e
98 changed files with 2202 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/include/excel/importModal.jsp
View File

@@ -21,6 +21,7 @@
<button class="close" data-dismiss="alert"></button>
<span></span>
</div>
<input type="hidden" name="fucntionId" id="fucntionId" value="${cfg.functionId }">
</br>
<c:if test="${serviceList != null && serviceList.size() > 0}">