From aa9c34737dd81d3ed4ed05b5f52b7edd8d14dee2 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 13 七月 2023 10:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/overhaulLog/edit.html | 4 ++--
src/main/resources/templates/tr/overhaulLog/add.html | 4 ++--
src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java b/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
index e149e73..d18bbf3 100644
--- a/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
@@ -107,7 +107,7 @@
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
PreventOverhaulLog overhaulLogById = overhaulLogService.getOverhaulLogById(id);
- mmap.put("overhaulLogById",overhaulLogById);
+ mmap.put("overhaulLog",overhaulLogById);
List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();
mmap.put("riskUnits", respDTOS);
return prefix + "/edit";
diff --git a/src/main/resources/templates/tr/overhaulLog/add.html b/src/main/resources/templates/tr/overhaulLog/add.html
index 478d3f1..27d4bf3 100644
--- a/src/main/resources/templates/tr/overhaulLog/add.html
+++ b/src/main/resources/templates/tr/overhaulLog/add.html
@@ -21,7 +21,7 @@
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="stopStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+ <input name="stopStartTime" class="form-control" placeholder="请选择开始时间" type="text">
</div>
</div>
</div>
@@ -30,7 +30,7 @@
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="stopEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+ <input name="stopEndTime" class="form-control" placeholder="请选择结束时间" type="text">
</div>
</div>
</div>
diff --git a/src/main/resources/templates/tr/overhaulLog/edit.html b/src/main/resources/templates/tr/overhaulLog/edit.html
index 7871b79..b204f82 100644
--- a/src/main/resources/templates/tr/overhaulLog/edit.html
+++ b/src/main/resources/templates/tr/overhaulLog/edit.html
@@ -22,7 +22,7 @@
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="stopStartTime" th:value="${#dates.format(overhaulLog.stopStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" >
+ <input name="stopStartTime" th:value="${#dates.format(overhaulLog.stopStartTime, 'yyyy-MM-dd HH:mm')}" class="form-control" placeholder="yyyy-MM-dd" type="text" >
</div>
</div>
</div>
@@ -31,7 +31,7 @@
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="stopEndTime" th:value="${#dates.format(overhaulLog.stopEndTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" >
+ <input name="stopEndTime" th:value="${#dates.format(overhaulLog.stopEndTime, 'yyyy-MM-dd HH:mm')}" class="form-control" placeholder="yyyy-MM-dd" type="text" >
</div>
</div>
</div>
--
Gitblit v1.9.2