Commit Graph

1694 Commits

Author SHA1 Message Date
闵炳辉
df0a554795 树刷新 2024-06-27 17:32:22 +08:00
高云鹏
a76ad92166 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-06-27 17:30:40 +08:00
高云鹏
6a24932a83 个人信息 2024-06-27 17:30:34 +08:00
chenhaojie
eb611ae799 das接口新增 2024-06-27 17:24:28 +08:00
chenhaojie
d4a89f7cae das接口新增 2024-06-27 17:18:42 +08:00
刘玉霞
b85ed5d11f 菜单 2024-06-27 17:16:10 +08:00
刘玉霞
be609b4c2f 路由中文 2024-06-27 16:55:36 +08:00
刘玉霞
3a1beee46f Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-06-27 16:47:45 +08:00
刘玉霞
34be956606 菜单 2024-06-27 16:47:34 +08:00
chenhaojie
979e2b2b28 das接口新增 2024-06-27 16:45:38 +08:00
闵炳辉
6fea44df88 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-06-27 16:40:37 +08:00
闵炳辉
cfa91d41bd 菜单树结构 2024-06-27 16:40:02 +08:00
刘玉霞
aa0bf7bf82 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-06-27 16:37:11 +08:00
刘玉霞
ba3f964a35 菜单 2024-06-27 16:36:58 +08:00
chenhaojie
7ab7b08a9a das接口新增 2024-06-27 15:50:21 +08:00
闵炳辉
9db3b8c1a1 菜单管理修改 2024-06-27 15:30:29 +08:00
chenhaojie
ecf094f70e das接口新增 2024-06-27 15:01:29 +08:00
刘玉霞
56aa7d0735 菜单 2024-06-27 14:58:56 +08:00
刘玉霞
2ff56a2579 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-06-27 14:34:41 +08:00
刘玉霞
bd94eecdce Merge branch 'main' of https://git.jsspisoft.com/ry-das 合并 2024-06-27 14:34:35 +08:00
闵炳辉
b6523fb3f6 页面菜单配置 2024-06-27 14:30:44 +08:00
刘玉霞
2f63d39281 服务器代理 2024-06-27 14:29:33 +08:00
houwei
f9f61bf74b 修复告警信息 2024-06-27 14:17:18 +08:00
谷成伟
854c6178ad 解决编译时枚举量找不到的警告提示 2024-06-27 13:15:44 +08:00
houwei
091569e4a0 修复告警信息 2024-06-27 10:57:29 +08:00
houwei
1bdb6bf1b8 修复告警信息 2024-06-27 10:51:48 +08:00
houwei
2cdcf68e0e Merge remote-tracking branch 'origin/main' 2024-06-27 10:35:17 +08:00
houwei
95c2e66178 清除未使用的import 2024-06-27 10:35:03 +08:00
chenhaojie
4a4a0d96aa das接口新增 2024-06-27 10:27:07 +08:00
houwei
0802e723af Merge remote-tracking branch 'origin/main' 2024-06-27 10:22:14 +08:00
houwei
944c4aae66 添加设备类型定义 2024-06-27 10:21:52 +08:00
chenhaojie
b0c0c6badb das接口修改 2024-06-27 10:20:43 +08:00
高云鹏
2b103a0b91 错误信息提示 2024-06-27 09:51:21 +08:00
高云鹏
891e884659 增加错误信息提示 2024-06-27 09:51:08 +08:00
houwei
14a8b5cc1c 权限定义调整 2024-06-27 09:48:04 +08:00
houwei
fbdfca18d0 修改api文档 2024-06-27 09:31:38 +08:00
houwei
29b36dbe6d 修复告警西信息 2024-06-27 09:12:12 +08:00
houwei
324df9a288 菜单树添加权限过滤 2024-06-27 08:55:14 +08:00
houwei
46237c74c0 菜单树添加权限过滤 2024-06-27 08:51:44 +08:00
闵炳辉
65cb66de2d Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-06-26 18:04:44 +08:00
闵炳辉
e6842c5ff7 用户接口调试 2024-06-26 18:04:40 +08:00
高云鹏
ec766abb36 角色、机构样式修改 2024-06-26 17:42:25 +08:00
高云鹏
7c37aa91dd 角色、机构静态菜单添加 2024-06-26 16:55:39 +08:00
高云鹏
43c063f63f Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-06-26 16:48:14 +08:00
高云鹏
27cf49e559 角色、机构功能完善 2024-06-26 16:47:56 +08:00
chenhaojie
957396d654 das接口新增 2024-06-26 16:15:25 +08:00
houwei
c1e5190a75 添加权限判断 2024-06-26 15:31:45 +08:00
houwei
02d5c8df7e Merge remote-tracking branch 'origin/main'
# Conflicts:
#	das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java
#	das/src/main/java/com/das/modules/auth/mapper/SysUserMapper.java
2024-06-26 15:30:08 +08:00
houwei
2625c01f05 添加权限判断 2024-06-26 15:25:06 +08:00
chenhaojie
230ae01b9e das接口新增 2024-06-26 15:23:58 +08:00