From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 61a8a7b..44a6ab4 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -85,7 +85,7 @@
@GetMapping("/selectOrderManDay")
public Result<?> selectOrderManDay(Integer id) {
int day = insProductService.selectOrderManDay(id);
- return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),"鎴愬姛");
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
--
Gitblit v1.9.3