|
|
1c7d840ff6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2022-01-04 09:45:33 +08:00 |
|
|
|
530b2a51d5
|
修改单词拼写错误
|
2021-12-30 14:13:38 +08:00 |
|
|
|
cedd2d1daf
|
优化导出数据操作
|
2021-11-17 11:57:17 +08:00 |
|
|
|
9cf4794146
|
update 更新 SysUser 导入导出
|
2021-08-04 18:29:38 +08:00 |
|
|
|
aa14085746
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-07-06 12:01:05 +08:00 |
|
|
|
9c7901f526
|
用户管理新增分配角色功能
|
2021-07-01 18:01:36 +08:00 |
|
|
|
2841620be6
|
初始化项目
|
2020-02-13 10:48:51 +08:00 |
|
|
|
abdb1048ed
|
删除文件 ruoyi-ui
|
2020-02-13 10:47:14 +08:00 |
|
|
|
b508e6f202
|
新增用户导入
|
2019-12-11 18:12:00 +08:00 |
|
|
|
fee8a5955b
|
若依 2.0
|
2019-12-02 09:28:11 +08:00 |
|
|
|
bcee37b84b
|
若依 1.1
|
2019-11-11 08:59:15 +08:00 |
|
|
|
46444bd0fe
|
RuoYi-Vue 1.0
|
2019-10-08 09:14:38 +08:00 |
|
