Commit Graph

481 Commits

Author SHA1 Message Date
8274c4654b 暂存 2022-12-07 18:50:34 +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
42a7674785 代码生成没有设置主键出现的bug修复、ftl模板更新 2022-12-07 14:10:24 +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
e01104696a 代码更新 2022-12-06 17:57:49 +08:00
zhangzhiqiang
e39abeb283 添加sso代码1 2022-12-06 15:08:15 +08:00
zhangzhiqiang
7ab56f5c42 添加sso代码 2022-12-06 14:57:59 +08:00
zhangzhiqiang
e1acad80cc 数据库修改 2022-12-05 20:27:27 +08:00
0b063b8d80 代码更新 2022-12-05 19:22:51 +08:00
387b591596 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-05 18:51:47 +08:00
42f5504c85 修改 2022-12-05 18:51:41 +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
c5a1ef2da4 更新 2022-12-05 15:44:55 +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
7ec52b45c8 修改 2022-12-05 10:22:43 +08:00
1156280ea3 代码更新 2022-12-04 17:52:00 +08:00
ec05773f77 代码更新 2022-12-04 17:33:18 +08:00
b833fb07bf 修改 2022-12-04 15:37:53 +08:00
7bcac23742 代码更新 2022-12-03 17:31:06 +08:00
aeedea5255 代码更新 2022-12-03 17:15:37 +08:00
716d890247 修改 2022-12-03 15:14:03 +08:00
51771d3d04 修改 2022-12-03 14:55:10 +08:00
1e8570c954 修改 2022-12-03 14:35:06 +08:00
54ece59f39 代码更新 2022-12-03 14:30:13 +08:00
2329278856 代码更新 2022-12-03 14:19:41 +08:00
6aad57945e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-03 14:03:51 +08:00
64efeb8da5 修改 2022-12-03 14:03:29 +08:00
5185c17d01 更新 2022-12-03 10:44:50 +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
5983d4cfd1 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-02 15:42:43 +08:00
9e1a65abe1 修改 2022-12-02 15:42:37 +08:00
0274838fab 代码更新 2022-12-02 15:40:03 +08:00
da5026069b 代码更新 2022-12-02 13:41:20 +08:00
f56285e075 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-02 11:36:02 +08:00
d3c5f0a931 修改 2022-12-02 11:35:56 +08:00