Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/templates/exam/test_package/test_package.html

@@ -16,7 +16,7 @@
                        </li>
                        <li>
                            <p>[[#{jsp.exam.report.TestPackage}]]：</p>
                            <input type="text" name="testName"/>
                            <input type="text" name="testName" th:value="${testName}"/>
                        </li>
                        <li>
                            <p>[[#{basis.type}]]：</p>