From 05b41f60a85d7d1ddfdef7a1fabdf7ed9157114f Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Tue, 6 Feb 2018 11:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=8F=9C=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=BF=85=E9=A1=BB=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/sys/menuForm.jsp | 6 ++++++
 src/main/webapp/WEB-INF/views/sys/menuList.jsp | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
index f31d3f1ad..6b12aa4d9 100644
--- a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
@@ -76,6 +76,12 @@
 									<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
 								</div>
 							</div>
+							<div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font>国际化代码:</label>
+								<div class="col-md-4">
+									<form:input path="code" htmlEscape="false" maxlength="50" class="required form-control"/>
+								</div>
+							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label">链接:</label>
 								<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/sys/menuList.jsp b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
index 8d2b856d0..fc5759676 100644
--- a/src/main/webapp/WEB-INF/views/sys/menuList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
@@ -61,10 +61,11 @@
 								<sys:message content="${message}"/>
 								<form id="listForm" method="post">
 									<table id="treeTable" class="table table-striped table-bordered table-condensed">
-										<thead><tr><th>名称</th><th>链接</th><th style="text-align:center;">排序</th><th>可见</th><th>权限标识</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
+										<thead><tr><th>名称</th><th>国际化代码</th><th>链接</th><th style="text-align:center;">排序</th><th>可见</th><th>权限标识</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${list}" var="menu">
 											<tr id="${menu.id}" pId="${menu.parent.id ne 1?menu.parent.id:0}">
 												<td nowrap><i class="icon-${not empty menu.icon?menu.icon:' hide'}"></i><a href="${ctx}/sys/menu/form?id=${menu.id}">${menu.name}</a></td>
+												<td>${menu.code}</td>
 												<td title="${menu.href}">${fns:abbr(menu.href,30)}</td>
 												<td style="text-align:center;">
 													<shiro:hasPermission name="sys:menu:edit">