Commit Graph

102 Commits

Author SHA1 Message Date
songjinsheng
42e4acf3dd 新增字典功能 2022-05-30 10:11:39 +08:00
songjinsheng
5c0a93f679 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev 2022-05-24 11:29:25 +08:00
songjinsheng
264a5d910f 修改接口 2022-05-24 11:29:11 +08:00
qdxkrs
15bc756bd4 修改冲突文件 2022-05-23 14:38:09 +08:00
qdxkrs
c424d5cd89 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
2022-05-23 14:37:16 +08:00
qdxkrs
9b784c99ed 修改bug 2022-05-23 14:36:19 +08:00
songjinsheng
5041f3f92f 注解修改 2022-05-23 14:17:46 +08:00
songjinsheng
f4caf10bd3 合并更新 2022-05-23 09:49:01 +08:00
songjinsheng
bb6fb94038 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
# Conflicts:1
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java
2022-05-23 09:48:47 +08:00
songjinsheng
7cfae514ea 控制器修改 2022-05-23 09:42:20 +08:00
qdxkrs
a51c6872d8 飞机✈保佑 2022-05-20 16:59:45 +08:00
songjinsheng
afa068f477 修改mapper 2022-05-20 15:17:51 +08:00
qdxkrs
c6fa415356 优化目录 2022-05-20 14:42:13 +08:00
qdxkrs
6006a9f18c 优化项目结构 2022-05-20 14:27:08 +08:00
songjinsheng
1722abfae7 Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms into dev 2022-05-20 14:20:17 +08:00
songjinsheng
57db36e015 no message 2022-05-20 14:19:34 +08:00
songjinsheng
43e3d8cfea 修改控制器 2022-05-20 14:19:25 +08:00
qdxkrs
1c16fc1d4a 添加基类 2022-05-20 14:18:53 +08:00
songjinsheng
598860d544 11 2022-05-20 11:56:55 +08:00
songjinsheng
95542bf4c9 Merge branch 'master' into test 2022-05-20 09:00:37 +08:00
songjinsheng
de1dd3a808 功能迭代 2022-05-20 08:56:41 +08:00
songjinsheng
8020eabaa9 更新 2022-05-11 15:58:35 +08:00
RuoYi
6f14087a16 修改显示顺序orderNum类型为整型 2022-04-25 10:23:47 +08:00
RuoYi
db2dfee6ae 用户缓存信息添加部门ancestors祖级列表 2022-04-07 09:50:42 +08:00
RuoYi
a854e0ca8e 若依 3.8.2 2022-04-01 08:30:48 +08:00
RuoYi
6130bebbb3 开启TopNav没有子菜单情况隐藏侧边栏 2022-03-06 09:03:44 +08:00
RuoYi
c8c57b545a 优化菜单关键字导致的插件报错问题 2022-02-22 19:10:34 +08:00
RuoYi
21780d8106 优化代码 2022-02-13 21:06:18 +08:00
RuoYi
d9859de756 代码优化 2022-02-12 13:13:04 +08:00
若依
a91d7cdd72
!428 删除方法无返回值时,方法注释上的@return,StringBuilder append() 改为链式调用
Merge pull request !428 from 我的世界有我/master
2022-02-12 03:55:12 +00:00
caohong
2532e40f9c 删除方法无返回值时,方法注释上的@return 2022-02-11 10:05:01 +08:00
稚屿
c99eb98001 代码优化 2022-02-09 09:10:50 +08:00
RuoYi
612c4293d1 用户访问控制时校验数据权限,防止越权 2022-01-27 12:05:04 +08:00
RuoYi
bed9fcea46 优化加载字典缓存数据 2022-01-14 11:46:51 +08:00
RuoYi
6353f4ff09 若依 3.8.1 2021-12-31 00:00:06 +08:00
RuoYi
d365a52cd6 自定义xss校验注解实现 2021-12-15 10:50:10 +08:00
RuoYi
850b98337b 修正用户分配角色属性错误 2021-12-06 20:58:10 +08:00
若依
7f2921f26b !382 update 优化查询用户的角色组、岗位组代码
Merge pull request !382 from 疯狂的狮子Li/update
2021-12-06 12:35:59 +00:00
疯狂的狮子li
4de4763baf update 优化查询用户的角色组、岗位组代码 2021-12-06 18:32:51 +08:00
疯狂的狮子li
965ebd0f03 fix 修复主键溢出问题 将查询返回类型改为 Long 2021-12-03 11:11:43 +08:00
RuoYi
6bfae2652f 若依 3.8.0 2021-12-01 08:53:11 +08:00
RuoYi
a2d3f987c0 优化代码 2021-11-30 11:15:17 +08:00
Awen
13c770b6be 优化一些布尔判断语法 2021-10-27 19:03:29 +08:00
Remenber_Ray
0628dc9b2f update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java. 2021-10-26 08:02:48 +00:00
RuoYi
e66d0e4f74 角色列表返回类型保持一致 2021-10-15 17:56:57 +08:00
疯狂的狮子Li
a006904724 fix 2021-09-30 03:18:41 +00:00
RuoYi
db193a46e8 若依 3.7.0 2021-09-13 09:36:38 +08:00
RuoYi
a5e38f6f99 菜单管理支持配置路由参数 2021-09-08 09:28:23 +08:00
Gold_Fish
b036e78d85 修改根据userId获取菜单sql 2021-08-30 02:42:49 +00:00
RuoYi
e52092c6d4 修改时检查用户数据权限范围 2021-08-24 16:00:39 +08:00