From c0d6e7b5da697bb7dff873839fd28f14a490d247 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 21 八月 2023 15:38:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/overhaulLog/overhaulLog.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/templates/tr/overhaulLog/overhaulLog.html b/src/main/resources/templates/tr/overhaulLog/overhaulLog.html
index 8ce0ae1..4124a1d 100644
--- a/src/main/resources/templates/tr/overhaulLog/overhaulLog.html
+++ b/src/main/resources/templates/tr/overhaulLog/overhaulLog.html
@@ -14,7 +14,7 @@
<label>安全风险单元名称：</label>
<select name="riskUnitId">
<option value="">--请选择安全风险分析单元--</option>
-<!-- <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option>-->
+ <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option>
</select>
</li>
<li>
@@ -57,7 +57,7 @@
visible: false
},
{
- field: 'riskUnitId',
+ field: 'riskUnitName',
title: '安全风险单元名称'
},
{
--
Gitblit v1.9.2