From 40eb98bcf3028ca1de391ac140f44920eddd9e8b Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 10:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
core/src/main/java/com/zt/life/sys/controller/UserExtController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/core/src/main/java/com/zt/life/sys/controller/UserExtController.java b/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
index 15a6e40..9ac7d2d 100644
--- a/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
+++ b/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
@@ -1,5 +1,7 @@
package com.zt.life.sys.controller;
+import com.zt.life.sys.model.SysUserReg;
+import com.zt.life.sys.model.SysUserRegister;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,9 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
/**
* 鐢ㄦ埛绠＄悊
@@ -82,4 +87,11 @@
return Result.ok();
}
+ @GetMapping("getUsersList")
+ @ApiOperation("杩斿洖鐢ㄦ埛鍒楄〃")
+ @LogOperation("杩斿洖鐢ㄦ埛鍒楄〃")
+ public Result<List<SysUser>> getUsersList() {
+ return Result.ok(sysUserService.getUsersList());
+ }
+
}
--
Gitblit v1.9.1