diff --git a/.gitignore b/.gitignore
index 08c4504..bac2731 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,6 @@ target/
 !**/src/test/**/target/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
 *.iws
 *.iml
 *.ipr
@@ -37,4 +33,4 @@ build/
 ### Mac OS ###
 .DS_Store
 
-/logs/
\ No newline at end of file
+logs
\ No newline at end of file
diff --git a/common/service-util/src/main/java/com/atguigu/CodeGet.java b/common/service-util/src/main/java/com/atguigu/CodeGet.java
index e71a3c0..af6fbca 100644
--- a/common/service-util/src/main/java/com/atguigu/CodeGet.java
+++ b/common/service-util/src/main/java/com/atguigu/CodeGet.java
@@ -18,7 +18,7 @@ public class CodeGet {
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
         // TODO 需要修改路径名称
-        gc.setOutputDir("F:\\File\\Java\\ssyx\\ssyx-parent\\service\\service-order" + "/src/main/java");
+        gc.setOutputDir("G:\\java项目\\guigu-oa\\guigu-oa-parent\\service-oa" + "/src/main/java");
 
         gc.setServiceName("%sService");    // 去掉Service接口的首字母I
         gc.setAuthor("bunny");
@@ -28,7 +28,7 @@ public class CodeGet {
         // 3、数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         // TODO 需要修改数据库
-        dsc.setUrl("jdbc:mysql://106.15.251.123:3305/shequ-order?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true");
+        dsc.setUrl("jdbc:mysql://106.15.251.123:3305/guigu-oa?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("02120212");
@@ -37,9 +37,9 @@ public class CodeGet {
 
         // 4、包配置
         PackageConfig pc = new PackageConfig();
-        pc.setParent("com.atguigu.ssyx");
+        pc.setParent("com.atguigu");
         // TODO 需要修改模块名
-        pc.setModuleName("order");
+        pc.setModuleName("auth");
         pc.setController("controller");
         pc.setService("service");
         pc.setMapper("mapper");
@@ -47,7 +47,6 @@ public class CodeGet {
 
         // 5、策略配置
         StrategyConfig strategy = getStrategyConfig();
-
         mpg.setStrategy(strategy);
 
         // 6、执行
@@ -57,7 +56,7 @@ public class CodeGet {
     private static StrategyConfig getStrategyConfig() {
         StrategyConfig strategy = new StrategyConfig();
         // TODO 要生成的表
-        strategy.setInclude("cart_info", "order_item", "order_info", "order_deliver");
+        strategy.setInclude("sys_user", "sys_role");
         strategy.setNaming(NamingStrategy.underline_to_camel);// 数据库表映射到实体的命名策略
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);// 数据库表字段映射到实体的命名策略
         strategy.setEntityLombokModel(true); // lombok 模型 @Accessors(chain = true) setter链式操作
diff --git a/common/service-util/target/classes/com/atguigu/CodeGet.class b/common/service-util/target/classes/com/atguigu/CodeGet.class
index d20e875..8d71498 100644
Binary files a/common/service-util/target/classes/com/atguigu/CodeGet.class and b/common/service-util/target/classes/com/atguigu/CodeGet.class differ
diff --git a/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java b/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java
index 26c9221..1916d5a 100644
--- a/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java
+++ b/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java
@@ -5,48 +5,50 @@ import com.atguigu.common.result.Result;
 import com.atguigu.model.system.SysRole;
 import com.atguigu.vo.system.SysRoleQueryVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Api(tags = "角色管理")
+@Tag(name = "角色管理接口")
 @RestController
 @RequestMapping("/admin/system/sysRole")
 public class SysRoleController {
     @Autowired
     private SysRoleService sysRoleService;
 
-    @ApiOperation(value = "查询全部角色列表")
+    @Operation(summary = "查询全部角色列表", description = "查询全部角色列表")
     @GetMapping("findAll")
     public Result<List<SysRole>> findAll() {
         List<SysRole> sysRoleList = sysRoleService.list();
         return Result.success(sysRoleList);
     }
 
-    @ApiOperation("角色条件分页查询")
+    @Operation(summary = "角色条件分页查询", description = "角色条件分页查询")
     @GetMapping("{page}/{limit}")
     public Result<IPage<SysRole>> pageResult(@PathVariable Long page, @PathVariable Long limit, SysRoleQueryVo sysRoleQueryVo) {
         IPage<SysRole> sysRoleIPage = sysRoleService.pageResult(page, limit, sysRoleQueryVo);
         return Result.success(sysRoleIPage);
     }
 
-    @ApiOperation(value = "新增角色")
+    @Operation(summary = "新增角色", description = "新增角色")
     @PostMapping("save")
     public Result<SysRole> save(@RequestBody SysRole sysRole) {
         sysRoleService.save(sysRole);
         return Result.success();
     }
 
-    @ApiOperation(value = "修改角色")
+    @Operation(summary = "修改角色", description = "修改角色")
     @PutMapping("update")
     public Result<SysRole> update(@RequestBody SysRole sysRole) {
         sysRoleService.updateById(sysRole);
         return Result.success();
     }
 
+    @Operation(summary = "删除角色", description = "删除角色")
     @ApiOperation(value = "删除角色")
     @DeleteMapping("remove/{id}")
     public Result<SysRole> remove(@PathVariable Long id) {
@@ -54,7 +56,7 @@ public class SysRoleController {
         return Result.success();
     }
 
-    @ApiOperation(value = "根据id列表删除")
+    @Operation(summary = "根据id列表删除", description = "根据id列表删除")
     @DeleteMapping("batchRemove")
     public Result<SysRole> batchRemove(@RequestBody List<Long> idList) {
         sysRoleService.removeByIds(idList);
diff --git a/service-oa/src/main/java/com/atguigu/auth/controller/SysUserController.java b/service-oa/src/main/java/com/atguigu/auth/controller/SysUserController.java
new file mode 100644
index 0000000..b133ddf
--- /dev/null
+++ b/service-oa/src/main/java/com/atguigu/auth/controller/SysUserController.java
@@ -0,0 +1,75 @@
+package com.atguigu.auth.controller;
+
+
+import com.atguigu.auth.service.SysUserService;
+import com.atguigu.common.result.Result;
+import com.atguigu.model.system.SysUser;
+import com.atguigu.vo.system.SysUserQueryVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表 前端控制器
+ * </p>
+ *
+ * @author bunny
+ * @since 2024-04-22
+ */
+@Tag(name = "用户管理接口")
+@RestController
+@RequestMapping("/admin/system/sysUser")
+public class SysUserController {
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Operation(summary = "用户条件分页查询", description = "用户条件分页查询")
+    @GetMapping("{page}/{limit}")
+    public Result<IPage<SysUser>> getUserByPage(@PathVariable Long page,
+                                                @PathVariable Long limit,
+                                                SysUserQueryVo sysUserQueryVo) {
+        IPage<SysUser> pageModel = sysUserService.getUserByPage(page, limit, sysUserQueryVo);
+        return Result.success(pageModel);
+    }
+
+    @Operation(summary = "获取用户", description = "获取用户")
+    @GetMapping("get/{id}")
+    public Result<SysUser> getById(@PathVariable Long id) {
+        SysUser sysUser = sysUserService.getById(id);
+        return Result.success(sysUser);
+    }
+
+    @Operation(summary = "保存用户", description = "保存用户")
+    @PostMapping("save")
+    public Result<SysUser> save(@RequestBody SysUser user) {
+        sysUserService.save(user);
+        return Result.success();
+    }
+
+    @Operation(summary = "更新用户", description = "更新用户")
+    @PutMapping("update")
+    public Result<SysUser> update(@RequestBody SysUser user) {
+        sysUserService.updateById(user);
+        return Result.success();
+    }
+
+    @Operation(summary = "删除用户", description = "删除用户")
+    @DeleteMapping("remove/{id}")
+    public Result<SysUser> remove(@PathVariable Long id) {
+        sysUserService.removeById(id);
+        return Result.success();
+    }
+
+    @Operation(summary = "批量删除用户", description = "批量删除用户")
+    @DeleteMapping("batchRemove")
+    public Result<SysUser> batchRemove(@RequestBody List<Long> idList) {
+        sysUserService.removeByIds(idList);
+        return Result.success();
+    }
+}
+
diff --git a/service-oa/src/main/java/com/atguigu/auth/mapper/SysUserMapper.java b/service-oa/src/main/java/com/atguigu/auth/mapper/SysUserMapper.java
new file mode 100644
index 0000000..cff3ce4
--- /dev/null
+++ b/service-oa/src/main/java/com/atguigu/auth/mapper/SysUserMapper.java
@@ -0,0 +1,16 @@
+package com.atguigu.auth.mapper;
+
+import com.atguigu.model.system.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户表 Mapper 接口
+ * </p>
+ *
+ * @author bunny
+ * @since 2024-04-22
+ */
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}
diff --git a/service-oa/src/main/java/com/atguigu/auth/service/SysUserService.java b/service-oa/src/main/java/com/atguigu/auth/service/SysUserService.java
new file mode 100644
index 0000000..64dafcf
--- /dev/null
+++ b/service-oa/src/main/java/com/atguigu/auth/service/SysUserService.java
@@ -0,0 +1,27 @@
+package com.atguigu.auth.service;
+
+import com.atguigu.model.system.SysUser;
+import com.atguigu.vo.system.SysUserQueryVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户表 服务类
+ * </p>
+ *
+ * @author bunny
+ * @since 2024-04-22
+ */
+public interface SysUserService extends IService<SysUser> {
+
+    /**
+     * 用户条件分页查询
+     *
+     * @param page  当前页
+     * @param limit 每页记录数
+     * @param vo    查询条件
+     * @return 分页结果
+     */
+    IPage<SysUser> getUserByPage(Long page, Long limit, SysUserQueryVo vo);
+}
diff --git a/service-oa/src/main/java/com/atguigu/auth/service/impl/SysUserServiceImpl.java b/service-oa/src/main/java/com/atguigu/auth/service/impl/SysUserServiceImpl.java
new file mode 100644
index 0000000..b15d719
--- /dev/null
+++ b/service-oa/src/main/java/com/atguigu/auth/service/impl/SysUserServiceImpl.java
@@ -0,0 +1,53 @@
+package com.atguigu.auth.service.impl;
+
+import com.atguigu.auth.mapper.SysUserMapper;
+import com.atguigu.auth.service.SysUserService;
+import com.atguigu.model.system.SysUser;
+import com.atguigu.vo.system.SysUserQueryVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+/**
+ * <p>
+ * 用户表 服务实现类
+ * </p>
+ *
+ * @author bunny
+ * @since 2024-04-22
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
+
+    /**
+     * 用户条件分页查询
+     *
+     * @param page  当前页
+     * @param limit 每页记录数
+     * @param vo    查询条件
+     * @return 分页结果
+     */
+    @Override
+    public IPage<SysUser> getUserByPage(Long page, Long limit, SysUserQueryVo vo) {
+        // 创建条件值
+        String username = vo.getKeyword();
+        String createTimeBegin = vo.getCreateTimeBegin();
+        String createTimeEnd = vo.getCreateTimeEnd();
+
+        // 创建分页对象
+        Page<SysUser> pageParam = new Page<>(page, limit);
+
+        // 分装查询对象
+        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(!StringUtils.isEmpty(username), SysUser::getUsername, username);
+        // 大于
+        wrapper.ge(!StringUtils.isEmpty(createTimeBegin), SysUser::getCreateTime, createTimeBegin);
+        // 小于
+        wrapper.le(!StringUtils.isEmpty(createTimeEnd), SysUser::getCreateTime, createTimeEnd);
+
+        return page(pageParam, wrapper);
+    }
+}
diff --git a/service-oa/src/main/resources/mapper/SysRoleController.java b/service-oa/src/main/resources/mapper/SysRoleController.java
new file mode 100644
index 0000000..d985b90
--- /dev/null
+++ b/service-oa/src/main/resources/mapper/SysRoleController.java
@@ -0,0 +1,20 @@
+package mapper;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 角色 前端控制器
+ * </p>
+ *
+ * @author bunny
+ * @since 2024-04-22
+ */
+@RestController
+@RequestMapping("/order/sys-role")
+public class SysRoleController {
+
+}
+
diff --git a/service-oa/src/main/resources/mapper/SysUserController.java b/service-oa/src/main/resources/mapper/SysUserController.java
new file mode 100644
index 0000000..b095421
--- /dev/null
+++ b/service-oa/src/main/resources/mapper/SysUserController.java
@@ -0,0 +1,20 @@
+package mapper;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户表 前端控制器
+ * </p>
+ *
+ * @author bunny
+ * @since 2024-04-22
+ */
+@RestController
+@RequestMapping("/order/sys-user")
+public class SysUserController {
+
+}
+