From 24cb4c00895e93e3f54c6cc268ea2c44e17d1026 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 11 九月 2023 11:27:07 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

---
 src/main/java/com/whyc/controller/DocLogController.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/DocLogController.java b/src/main/java/com/whyc/controller/DocLogController.java
index c776b28..c541d6d 100644
--- a/src/main/java/com/whyc/controller/DocLogController.java
+++ b/src/main/java/com/whyc/controller/DocLogController.java
@@ -1,6 +1,8 @@
 package com.whyc.controller;
 
 import com.whyc.dto.Response;
+import com.whyc.pojo.DocLog;
+import com.whyc.pojo.DocUser;
 import com.whyc.service.DocLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,8 +17,13 @@
     private DocLogService service;
 
     @ApiOperation(value = "鏃ュ織鏌ヨ")
-    @GetMapping("searchLog")
-    public Response searchLog(@RequestParam int pageCurr, @RequestParam int pageSize){
-        return service.searchLog(pageCurr,pageSize);
+    @PostMapping("searchLog")
+    public Response logInformation(@RequestBody(required = false) DocLog docLog, @RequestParam int pageCurr, @RequestParam int pageSize){
+        return service.searchLog(docLog,pageCurr,pageSize);
+    }
+    @ApiOperation(value = "鎿嶄綔瀵瑰簲鍏崇郴")
+    @GetMapping("getOperate")
+    public Response operateAll(){
+        return service.getOperate();
     }
 }

--
Gitblit v1.9.1