From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua

---
 src/main/resources/static/i18n/messages_zh_CN.properties |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/static/i18n/messages_zh_CN.properties b/src/main/resources/static/i18n/messages_zh_CN.properties
index 5e4f0e0..a13354d 100644
--- a/src/main/resources/static/i18n/messages_zh_CN.properties
+++ b/src/main/resources/static/i18n/messages_zh_CN.properties
@@ -956,4 +956,9 @@
 jsp.main.other.002=\u672A\u5B8C\u6210\u7684\u6D4B\u8BD5\u8BB0\u5F55\uFF08\u6B63\u5728\u7B54\u9898\u6216\u8005\u6682\u65F6\u653E\u5F03\u7B54\u9898\uFF09
 jsp.main.other.003=\u6700\u8FD1\u521B\u5EFA\u7684\u6D4B\u8BD5\u5305
 jsp.main.other.004=\u6700\u540E\u72B6\u6001\u65F6\u95F4
-jsp.main.other.005=\u7C7B\u578B
\ No newline at end of file
+jsp.main.other.005=\u7C7B\u578B
+menu.exam.test_package.search=\u641C\u7D22\u6D4B\u8BD5\u5305
+jsp.exam.package.langtype=\u90AE\u4EF6\u8BED\u8A00\u7C7B\u578B
+jsp.exam.test_package.memberEmailContent=\u6D4B\u8BD5\u8005\u62A5\u544A\u90AE\u4EF6\u5185\u5BB9
+menu.exam.evaluation_report.view=\u8BC4\u6D4B\u62A5\u544A\u5217\u8868
+jsp.exam.evaluation_report.export.msg=\u6682\u4E0D\u652F\u6301\u5BFC\u51FA\u5168\u90E8
\ No newline at end of file

--
Gitblit v1.9.1