From 94dae325bbe4e23d1a5ebc08788b7d5a7e39a029 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 14 Oct 2024 18:03:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

---
 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
index 1b0ae7d..dd675de 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
@@ -1,12 +1,13 @@
 package cn.huge.module.grid.controller;
 
 import cn.huge.base.common.bo.R;
-import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.grid.domain.dto.GridRoleMenuDTO;
 import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
-import cn.huge.module.grid.domain.dto.GridUserRoleDTO;
 import cn.huge.module.grid.domain.vo.*;
 import cn.huge.module.grid.service.GridUserService;
+import cn.huge.module.sys.dto.GridRoleMenuDTO;
+import cn.huge.module.sys.dto.GridUserRoleDTO;
+import cn.huge.module.sys.vo.GridRoleMenuVo;
+import cn.huge.module.sys.vo.GridUserRoleVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -48,4 +49,9 @@
     public R<List<GridRoleMenuDTO>> getRoleMenu(@RequestBody GridRoleMenuVo gridRoleMenuVo) {
         return gridUserService.getRoleMenu(gridRoleMenuVo);
     }
+
+    public R<String> initNewUsers(@RequestBody GridUserRoleVo gridUserRoleVo){
+        return gridUserService.initNewUsers(gridUserRoleVo);
+
+    }
 }

--
Gitblit v1.8.0