From 937daff0ebc1aa16a852d5a86434ab1994d8a02d Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期一, 11 九月 2023 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/qxueyou/scc/controller/UserController.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/controller/UserController.java b/src/main/java/com/qxueyou/scc/controller/UserController.java
index b1f8953..10115ab 100644
--- a/src/main/java/com/qxueyou/scc/controller/UserController.java
+++ b/src/main/java/com/qxueyou/scc/controller/UserController.java
@@ -175,4 +175,12 @@
 		return userRoleService.addRole(name,String.valueOf(roleType));
 	}
 
+
+	/**
+	 * 缁熻浜烘暟
+	 */
+	@GetMapping(value = "countUser")
+	public Result countUser() {
+		return new Result(true,"cg", CollectionUtils.newObjectMap("sex",userService.countUsersex(),"sex2",userService.countUser()));
+	}
 }

--
Gitblit v1.8.0