Commit Graph

570 Commits

Author SHA1 Message Date
90c2076f86 代码更新 2022-12-09 15:50:50 +08:00
053f7da003 代码更新 2022-12-09 14:31:34 +08:00
f8a597136e 更新 2022-12-09 14:29:54 +08:00
79d0312d71 GX 2022-12-09 14:16:46 +08:00
2653259bf3 代码更新 2022-12-09 13:25:29 +08:00
43eb80b9f1 修改 2022-12-09 13:20:19 +08:00
82b5575f9c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-09 13:19:23 +08:00
27d5e5fafe 修改 2022-12-09 13:19:17 +08:00
9a4e78a555 代码更新 2022-12-09 13:17:40 +08:00
f4faa60d40 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-09 13:17:26 +08:00
129323c8cc 代码合并 2022-12-09 13:17:16 +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
db05e18cae add:添加免登 2022-12-09 11:24:25 +08:00
zhangzhiqiang
1e3db94687 fix:菜单隐藏字段 2022-12-09 10:21:13 +08:00
720dd78066 更新 2022-12-09 09:19:49 +08:00
37987a5a4d 代码更新 2022-12-08 17:56:57 +08:00
fba45c44b8 用户中心 2022-12-08 17:50:12 +08:00
zhangzhiqiang
e6e459b038 fix:部门新增查询接口 2022-12-08 17:40:36 +08:00
zhangzhiqiang
45eb611a57 fix:sys_dict关联查询 2022-12-08 16:51:20 +08:00
2c0cd0abb0 loki显示 2022-12-08 16:09:03 +08:00
d1764f476c 添加回滚注解 2022-12-08 15:44:11 +08:00
7e30b906d1 代码更新 2022-12-08 14:41:24 +08:00
zhangzhiqiang
7902ae10f6 前端迁移 2022-12-08 11:11:28 +08:00
zhangzhiqiang
a1ce0dfaed fix用户更新修改 2022-12-08 10:35:14 +08:00
d4dfe5c07d 代码更新 2022-12-08 10:29:29 +08:00
zhangzhiqiang
c0c50900db Merge remote-tracking branch 'origin/feature/sso_function_v1205' into feature/sso_function_v1205 2022-12-07 19:43:21 +08:00
zhangzhiqiang
0aa260e7da add:添加sadao:redis 2022-12-07 19:42:55 +08:00
3cb3066f38 更新 2022-12-07 19:09:31 +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
13dc4bfddc 更新 2022-12-07 16:34:33 +08:00
533073eb11 更新 2022-12-07 16:34:01 +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
zhangzhiqiang
2e636fbc8a 前端迁移 2022-12-07 15:56:12 +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
42a7674785 代码生成没有设置主键出现的bug修复、ftl模板更新 2022-12-07 14:10:24 +08:00
cba07beb7c 代码更新 2022-12-07 11:27:37 +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
ccf47c38b8 登录跳转 2022-12-07 10:02:00 +08:00
zhangzhiqiang
1c8ff91cb8 登入代码 2022-12-07 10:00:48 +08:00
zhangzhiqiang
b2588d3010 前端迁移 2022-12-07 09:20:30 +08:00