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/templates/exam/test_package/test_package.html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/exam/test_package/test_package.html b/src/main/resources/templates/exam/test_package/test_package.html
index 682f0eb..c051318 100644
--- a/src/main/resources/templates/exam/test_package/test_package.html
+++ b/src/main/resources/templates/exam/test_package/test_package.html
@@ -15,8 +15,8 @@
                             <input type="text" name="userName"/>
                         </li>
                         <li>
-                            <p>[[#{basis.name}]]锛�</p>
-                            <input type="text" name="testName"/>
+                            <p>[[#{jsp.exam.report.TestPackage}]]锛�</p>
+                            <input type="text" name="testName" th:value="${testName}"/>
                         </li>
                         <li>
                             <p>[[#{basis.type}]]锛�</p>
@@ -94,7 +94,7 @@
                class="btn" onclick="javascript:recover()" shiro:hasPermission="exam:test_package:recover">
                 <i class="fa fa-address-book"></i> [[#{jsp.exam.test_package.006}]]
             </a>
-            <a style="background-color: #7b76b7;border-color: #7b76b7;color: #FFFFFF"
+            <a style="background-color:#b459d4;color:#ffffff"
                 class="btn" onclick="javascript:testReport()" shiro:hasPermission="exam:test_package:testreport">
                 <i class="fa fa-download"></i> [[#{jsp.exam.test_package.007}]]
             </a>

--
Gitblit v1.9.1