From d48d966dfde7a0c31bd81466559e5e8d681dc200 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 21 十月 2023 16:16:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java b/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java
index 2ef17de..9dd246d 100644
--- a/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java
+++ b/igds-databoard/src/main/java/com/ld/igds/databoard/controller/DataboardController.java
@@ -42,6 +42,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -305,7 +306,7 @@
inoutCommonManager.initInoutScreen(param.getCompanyId(),param.getDeptId());
- return new PageResponse<String>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛锛�");
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛锛�");
}
/**
--
Gitblit v1.9.3