Commit Graph

72 Commits

Author SHA1 Message Date
RuoYi a7eb0f98ac README 2020-08-03 09:02:28 +08:00
疯狂的狮子li 2e37fe9bc9 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2020-06-01 13:40:15 +08:00
疯狂的狮子li 5f866906d1 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/data.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/assets/styles/element-variables.scss
	ruoyi-ui/src/components/SvgIcon/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Link.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.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/userAvatar.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/vue.config.js
	ruoyi/pom.xml
	ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
	ruoyi/src/main/resources/application.yml
	ruoyi/src/main/resources/vm/sql/sql.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
2020-06-01 13:34:08 +08:00
RuoYi b4b3ff8813 若依 2.3 2020-06-01 10:49:36 +08:00
疯狂的狮子li 48999868d8 update README.md. 2020-05-27 17:49:10 +08:00
疯狂的狮子li 4460fae46f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-05-23 10:31:39 +08:00
疯狂的狮子li c20dabbcdf 更改 README.md 增加改动说明 2020-05-23 10:29:31 +08:00
RuoYi 2bd787f633 README 2020-05-22 17:46:56 +08:00
RuoYi cad8604cac README 2020-05-19 11:40:15 +08:00
RuoYi aa23ef1e99 添加新群号:104180207 2020-04-28 12:05:52 +08:00
RuoYi 48509d6488 添加新群号 2020-04-08 14:22:48 +08:00
RuoYi c23c8ae248 README 2020-02-08 14:54:17 +08:00
RuoYi f754a18676 添加新群号 2020-01-11 10:39:49 +08:00
RuoYi 8216d4e839 阿里云服务器89元/年,双12年末特惠,爆款产品限时1折 2019-12-09 11:33:23 +08:00
RuoYi fee8a5955b 若依 2.0 2019-12-02 09:28:11 +08:00
RuoYi 3af0158d40 2019年度最受欢迎中国开源软件评选
请给若依/RuoYi 投票,谢谢。
2019-11-20 10:46:05 +08:00
RuoYi bcee37b84b 若依 1.1 2019-11-11 08:59:15 +08:00
RuoYi c0e7f31fac 阿里云服务器86元/年,双11冰点底价,错过再等1年 2019-10-24 11:12:56 +08:00
RuoYi 66d6a5d0b1 若依前后端分离群937441 2019-10-11 15:36:01 +08:00
RuoYi 4b7400f272 前后端分离交流群 2019-10-08 10:49:39 +08:00
RuoYi 46444bd0fe RuoYi-Vue 1.0 2019-10-08 09:14:38 +08:00
若依 5bc7455464 Initial commit 2019-10-08 09:01:46 +08:00