admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,335 Commits 3 Branches 0 Tags
Commit Graph

1335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子Li
4952f7dcdb !61 update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java. 
Merge pull request !61 from 陆继保/N/A
 2021-06-29 07:17:35 +00:00
陆继保
200170e5f3 update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java. 2021-06-29 07:04:25 +00:00
疯狂的狮子li
10a6a9192d update 更新 MP 详细日志配置 2021-06-29 09:57:45 +08:00
疯狂的狮子li
99de90a015 update 更新配置注释(规范使用方法) 2021-06-28 19:23:02 +08:00
疯狂的狮子li
cb54546259 Merge remote-tracking branch 'origin/dev' into dev 2021-06-28 13:54:53 +08:00
疯狂的狮子li
efd1fc017b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-ui/vue.config.js
 2021-06-28 13:52:19 +08:00
RuoYi
04f5a93aa8 升级pagehelper到最新版1.3.1 2021-06-25 17:25:49 +08:00
若依
751ca90690 !251 修复日志列表取消字段排序时的报错问题 
Merge pull request !251 from 稚屿/N/A
 2021-06-25 09:23:45 +00:00
疯狂的狮子Li
b73a67455d update README.md. 2021-06-25 08:01:54 +00:00
疯狂的狮子Li
b51b8b1b41 update README.md. 2021-06-25 08:00:38 +00:00
疯狂的狮子li
4d7ef44aee Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-24 17:14:15 +08:00
疯狂的狮子li
3148781045 update 更新文档 提问四部曲 2021-06-24 17:13:19 +08:00
疯狂的狮子li
96507d3709 update 更新文档 提问四部曲 2021-06-24 17:12:48 +08:00
疯狂的狮子li
5ddfd5bf11 update 更新文档 提问四部曲 2021-06-24 17:10:38 +08:00
朱杰
f6dd60c051 update 修改readme加入提问四部曲 2021-06-24 17:10:37 +08:00
疯狂的狮子li
beef02a4b6 update 更新文档 提问四部曲 2021-06-24 17:10:03 +08:00
朱杰
676ecd9052 update 修改readme加入提问四部曲 2021-06-24 17:06:49 +08:00
疯狂的狮子li
4962ec7589 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-24 15:46:01 +08:00
疯狂的狮子li
cc2fbc7b89 fix 相对路径下载问题 2021-06-24 15:42:51 +08:00
疯狂的狮子li
66f453452e fix 相对路径下载问题 2021-06-24 15:41:16 +08:00
疯狂的狮子li
24c7ff7959 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-24 09:54:13 +08:00
疯狂的狮子li
dfd7f594b5 update 更新文档版本 2021-06-24 09:39:33 +08:00
疯狂的狮子li
9b76b5ac98 update 更新文档版本 2021-06-24 09:39:14 +08:00
疯狂的狮子Li
9edab3dc55 !58 同步dev分支 
Merge pull request !58 from 疯狂的狮子Li/dev
 2021-06-24 01:36:00 +00:00
疯狂的狮子li
3eee19c9a2 Merge remote-tracking branch 'origin/dev' into dev 2021-06-24 09:34:16 +08:00
疯狂的狮子li
8195e948a1 发布 v2.4.0 2021-06-24 09:34:06 +08:00
稚屿
1dfeae6a03 修复日志列表取消字段排序时的报错问题 2021-06-24 00:27:37 +00:00
疯狂的狮子li
ae43edeb4f update 更新 初始化项目 文档地址 2021-06-23 21:24:13 +08:00
疯狂的狮子li
1488a09b8e Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-23 18:08:17 +08:00
疯狂的狮子li
152a386ac1 add 增加 Swagger3 用法示例 2021-06-23 17:01:30 +08:00
疯狂的狮子li
c4712bcb52 Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-23 15:31:22 +08:00
疯狂的狮子li
4545beab51 update 更新文档 增加 GitHub 地址 与其他小标签 2021-06-23 15:30:26 +08:00
疯狂的狮子li
f48e807cee remove 删除无用测试类 2021-06-23 09:51:44 +08:00
疯狂的狮子li
c12dc71ece Merge remote-tracking branch 'origin/dev' 
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
 2021-06-23 09:44:04 +08:00
疯狂的狮子li
ce3562b3ea Merge remote-tracking branch 'origin/dev' 2021-06-23 09:43:31 +08:00
疯狂的狮子li
d05458aa3a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
 2021-06-23 09:38:53 +08:00
RuoYi
1ed60c79c0 用户信息长度校验限制 2021-06-22 20:45:19 +08:00
RuoYi
aee1e53140 全局挂载字典标签组件 2021-06-22 20:44:40 +08:00
疯狂的狮子li
c822e2f6cc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/monitor/druid/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
 2021-06-22 16:56:38 +08:00
疯狂的狮子li
f098222a43 update 集成 Lock4j 分布式锁 2021-06-22 16:45:37 +08:00
sxq
715abe1140 删除redislockmanager 2021-06-22 16:31:41 +08:00
sxq
645c926bbd 集成lock4j框架，删除redisson锁，使用lock4j的锁。 2021-06-22 16:06:02 +08:00
sxq
56eba9cded Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts. 2021-06-22 15:35:52 +08:00
Ricky
253e2b2de1 增加字典标签样式回显 2021-06-22 14:24:26 +08:00
疯狂的狮子li
1790c81603 fix 修复地址ip地址特殊回环问题 2021-06-22 14:12:51 +08:00
Ricky
b1413f021e 增加字典标签样式回显 2021-06-22 14:04:14 +08:00
疯狂的狮子li
fef57cb312 update 更新文档说明 2021-06-22 14:01:35 +08:00
疯狂的狮子li
a129fafb69 update 更新多数据源与缓存 注意事项 2021-06-22 13:57:36 +08:00
疯狂的狮子li
81897d0b04 update 更新多数据源演示案例 2021-06-22 13:43:20 +08:00
疯狂的狮子li
40bba563d6 update 优化多数据源aop顺序问题 2021-06-22 13:43:05 +08:00