From f57c1111d78b3442b2a9e2eaea255157cdcb9574 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 03 Apr 2020 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 2076cbf..7e38efd 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -332,4 +332,8 @@
     private boolean checkAdmin(long id) {
         return id == 1L;
     }
+    @PostMapping("/users/findAll")
+    public ResultBody findAll(@RequestParam Map<String,Object> map) {
+        return appUserService.findAll(map);
+    }
 }

--
Gitblit v1.8.0