11 Commits

Author SHA1 Message Date
疯狂的狮子li
01e8fe5ddb fix 头像上传 未走OSS存储问题 2021-08-04 13:10:28 +08:00
疯狂的狮子li
7076deb2b6 update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 2021-05-20 13:23:12 +08:00
疯狂的狮子li
5494ec36e5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
2021-03-09 09:32:49 +08:00
RuoYi
61432480c8 删除多余的代码 2021-03-07 11:06:47 +08:00
疯狂的狮子li
f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
2020-12-11 14:27:54 +08:00
RuoYi
f90899d72a 支持主题风格配置 2020-12-07 14:13:02 +08:00
疯狂的狮子li
b15be7078c 同步ruoyi-vue更新 2020-05-06 11:57:51 +08:00
RuoYi
a34edef603 vuex用户名取值修正 2020-04-29 15:02:17 +08:00
疯狂的狮子li
2841620be6 初始化项目 2020-02-13 10:48:51 +08:00
疯狂的狮子li
abdb1048ed 删除文件 ruoyi-ui 2020-02-13 10:47:14 +08:00
RuoYi
46444bd0fe RuoYi-Vue 1.0 2019-10-08 09:14:38 +08:00