From bf8d8aaf62190e0d49bbd34e3bb2aa7707d86537 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期三, 22 五月 2024 10:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java
index 583fcb9..952af09 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java
@@ -41,6 +41,14 @@
return prefix + "/holeLog";
}
+ @RequiresPermissions("geo:holeLog:view")
+ @GetMapping("/viewHoleLog")
+ public String holeLog2(String projectId, String holeCode, ModelMap mmap) {
+ mmap.put("projectId", projectId);
+ mmap.put("holeCode", holeCode);
+ return prefix + "/holeLog2";
+ }
+
/**
* 鏌ヨ閽诲瓟鏃ュ織鍒楄〃
*/
@@ -70,8 +78,9 @@
* 鏂板閽诲瓟鏃ュ織
*/
@GetMapping("/add")
- public String add(String projectId, ModelMap mmap) {
+ public String add(String projectId, String holeCode, ModelMap mmap) {
mmap.put("projectId", projectId);
+ mmap.put("holeCode", holeCode);
return prefix + "/add";
}
--
Gitblit v1.9.1