Commit Graph

214 Commits

Author SHA1 Message Date
ea016bd66a Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-10 13:55:39 +08:00
26be49dd91 修改 2022-12-10 13:55:33 +08:00
0d7e206298 代码更新 2022-12-10 13:31:48 +08:00
f9084a0bab 代码更新 2022-12-10 13:25:25 +08:00
c5fe289259 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-10 10:49:43 +08:00
c8cb2bfabc 修改 2022-12-10 10:49:38 +08:00
f31021f907 数据权限绑定 2022-12-09 17:59:51 +08:00
zhangzhiqiang
79cf1955e5 fix:修改菜单管理兼容多系统 2022-12-09 17:33:51 +08:00
90c2076f86 代码更新 2022-12-09 15:50:50 +08:00
fd0030270f Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-09 13:16:19 +08:00
ed8511c07c 修改 2022-12-09 13:16:11 +08:00
zhangzhiqiang
1e3db94687 fix:菜单隐藏字段 2022-12-09 10:21:13 +08:00
fba45c44b8 用户中心 2022-12-08 17:50:12 +08:00
7e30b906d1 代码更新 2022-12-08 14:41:24 +08:00
zhangzhiqiang
7902ae10f6 前端迁移 2022-12-08 11:11:28 +08:00
d4dfe5c07d 代码更新 2022-12-08 10:29:29 +08:00
c875eb0bfe 冲突 2022-12-07 18:55:49 +08:00
8274c4654b 暂存 2022-12-07 18:50:34 +08:00
zhangzhiqiang
e22f3008b1 mdf:部门页面修改 2022-12-07 18:38:11 +08:00
zhangzhiqiang
8223d3e2db 前端迁移 2022-12-07 17:01:39 +08:00
zhangzhiqiang
34a4ec4b26 用户页面修改 2022-12-07 16:55:42 +08:00
bfc143387f Merge branch 'feature/sso_function_v1205' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso_function_v1205 2022-12-07 15:56:27 +08:00
2a0913ec35 暂存 2022-12-07 15:52:04 +08:00
zhangzhiqiang
1e72538fc1 fix用户页面 2022-12-07 15:51:22 +08:00
60cb32dc7e 代码更新 2022-12-07 14:51:51 +08:00
83ca5012e7 Merge branch 'feature/sso_function_v1205' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso_function_v1205 2022-12-07 11:23:59 +08:00
f4199191b6 代码 修改 2022-12-07 11:23:45 +08:00
zhangzhiqiang
ac1f468edd login路由 2022-12-07 10:32:14 +08:00
298df5d2df 角色时间显示 2022-12-07 10:28:05 +08:00
zhangzhiqiang
b2588d3010 前端迁移 2022-12-07 09:20:30 +08:00
04ea3d02cf 代码更新 2022-12-06 19:12:51 +08:00
e01104696a 代码更新 2022-12-06 17:57:49 +08:00
618f0e0831 代码更新 2022-12-06 11:01:20 +08:00
0b063b8d80 代码更新 2022-12-05 19:22:51 +08:00
759310614c 代码更新 2022-12-05 18:41:58 +08:00
9da10682a0 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-05 17:30:45 +08:00
30f864d37b 修改 2022-12-05 17:30:38 +08:00
68623a8ace 代码更新 2022-12-05 14:31:22 +08:00
00f520fb02 代码更新 2022-12-05 13:36:02 +08:00
f8144305f2 修改 2022-12-05 11:43:18 +08:00
1156280ea3 代码更新 2022-12-04 17:52:00 +08:00
b833fb07bf 修改 2022-12-04 15:37:53 +08:00
716d890247 修改 2022-12-03 15:14:03 +08:00
51771d3d04 修改 2022-12-03 14:55:10 +08:00
54ece59f39 代码更新 2022-12-03 14:30:13 +08:00
2329278856 代码更新 2022-12-03 14:19:41 +08:00
64efeb8da5 修改 2022-12-03 14:03:29 +08:00
e35bb630cd Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-03 09:37:21 +08:00
a4a31a7d78 修改 2022-12-03 09:37:16 +08:00
cfaf27908f 代码更新 2022-12-03 09:35:23 +08:00