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://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
This commit is contained in:
duandongmei
2018-08-19 15:55:27 +08:00
parent 8c7e1d088d 8db613d464
commit 45556b7e05
27 changed files with 1118 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -243,7 +243,7 @@
<c:choose>
<c:when test="${fn:length(_cfg.complexList)>0}">
<c:set var="isBreak" value="false" ></c:set>
<c:forEach items="${_cfg.complexList}" var="complexCfg">
<c:forEach items="${_cfg.complexList}" var="cfg">
<c:choose>
<c:when test="${region.configRegionCode eq complexCfg.cfgRegionCode and !isBreak}">
<div class="row boxSolid ${tabName}${status.index}">