From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 68a82f8..8edb780 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -20,6 +20,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -312,7 +314,7 @@
      */
     @ResponseBody
     @PostMapping("/base/appUser/queryAppUser")
-    public TAppUser queryAppUser(Integer appUserId){
+    public TAppUser queryAppUser(@RequestBody Integer appUserId){
         try {
             TAppUser appUser = appUserService.getById(appUserId);
             return appUser;
@@ -336,4 +338,16 @@
             e.printStackTrace();
         }
     }
+
+
+    @PostMapping("/base/appUser/getAllUser")
+    @ResponseBody
+    public List<TAppUser> getAllUser(){
+        try {
+            return appUserService.list();
+        }catch (Exception e){
+            e.printStackTrace();
+            return new ArrayList<>();
+        }
+    }
 }

--
Gitblit v1.7.1