wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Ry-master/ruoyi-ui/src
History
疯狂的狮子li d0b2166525 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
 		2021-05-28 10:07:15 +08:00
..
api Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-05-28 10:07:15 +08:00
assets Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-05-11 17:14:53 +08:00
components update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 2021-05-20 13:23:12 +08:00
directive/permission 初始化项目 2020-02-13 10:48:51 +08:00
layout 正式发布 1.0.0 2021-05-10 15:34:17 +08:00
router Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-11-30 12:41:39 +08:00
store update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 2021-05-20 13:23:12 +08:00
utils Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-04-14 13:22:31 +08:00
views Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-05-28 10:07:15 +08:00
App.vue 初始化项目 2020-02-13 10:48:51 +08:00
main.js Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2021-01-06 09:35:00 +08:00
permission.js Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2021-03-09 09:32:49 +08:00
settings.js 正式发布 1.0.0 2021-05-10 15:34:17 +08:00