Commit Graph

998 Commits

Author SHA1 Message Date
zhangzhiqiang
1e66a048f9 fix:修改sys.xls 2023-01-04 14:51:08 +08:00
37ad356ebf 代码更新 2023-01-04 13:21:28 +08:00
f9820e2d96 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-01-04 13:20:55 +08:00
59585c2f4d 代码合并 2023-01-04 13:20:45 +08:00
zhangzhiqiang
0c280d76fb Merge remote-tracking branch 'origin/master' 2023-01-04 11:49:00 +08:00
zhangzhiqiang
da0518ce2f mdf:sys_dict sql 2023-01-04 11:48:39 +08:00
1c3b5c19a4 修改 2023-01-03 09:48:21 +08:00
9ea215c612 GX 2022-12-31 17:16:01 +08:00
55976af93f 更新 2022-12-31 14:46:34 +08:00
31e954e6c2 更新 2022-12-30 21:15:06 +08:00
3375ec7b18 更新 2022-12-30 20:27:12 +08:00
zhangzhiqiang
e263639d42 add:添加日志 2022-12-30 18:13:49 +08:00
zhangzhiqiang
6c09f8a94b 手持登入token前缀修改 2022-12-30 16:59:49 +08:00
zhangzhiqiang
390066178d add:生产环境日志输出控制台 2022-12-30 16:35:22 +08:00
zhangzhiqiang
a130fc0f62 启动类不添加@Tran 2022-12-30 15:47:36 +08:00
zhangzhiqiang
384f15f92c Merge remote-tracking branch 'origin/master' 2022-12-30 15:23:36 +08:00
zhangzhiqiang
fe11c0acc4 mdf:实现类加@Transactional 2022-12-30 15:20:55 +08:00
49a39d5e15 更新 放货前再开门 电气要求 2022-12-30 14:47:44 +08:00
zhangzhiqiang
a51593a415 MDF:usernick_name->person_name 2022-12-30 14:34:59 +08:00
zhangzhiqiang
4d144a842d dev环境redis修改 2022-12-30 14:07:01 +08:00
zhangzhiqiang
cf871c8788 tianjia 2022-12-30 14:03:34 +08:00
zhangzhiqiang
0415f8a10e 定时任务及loki 2022-12-30 13:56:43 +08:00
81ffa2127c 更新 2022-12-30 12:27:22 +08:00
831e1616df 更新 2022-12-30 12:02:38 +08:00
6af24f299a Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_test 2022-12-30 10:21:01 +08:00
2294282665 日志参数 2022-12-30 10:17:29 +08:00
3426e572da Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-30 10:16:51 +08:00
a34bb6cb9e 修改 2022-12-30 10:16:46 +08:00
zhangzhiqiang
d540fdfa04 同步sql 2022-12-30 09:27:57 +08:00
zhangzhiqiang
fc0e423de2 同步sql 2022-12-30 09:12:00 +08:00
zhangzhiqiang
328b518429 mdf:个人中心页面 2022-12-30 09:01:36 +08:00
88837d5972 Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso-server-merge-1228 2022-12-30 08:57:54 +08:00
829b5f2c57 登录跳转 2022-12-30 08:57:42 +08:00
zhangzhiqiang
b9f28c2012 同步sql 2022-12-30 08:53:38 +08:00
f741e2eed5 更新 2022-12-29 23:05:28 +08:00
zhangzhiqiang
3f1fdd74ee Merge remote-tracking branch 'origin/feature/sso-server-merge-1228' into feature/sso-server-merge-1228 2022-12-29 18:01:40 +08:00
zhangzhiqiang
6d4321d647 add:分页插件 2022-12-29 18:01:33 +08:00
911e9f73c3 分页 2022-12-29 17:50:48 +08:00
cb9918adb9 Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso-server-merge-1228 2022-12-29 17:43:24 +08:00
4b7a383fa0 mybatis配置文件 2022-12-29 17:43:13 +08:00
zhangzhiqiang
f62a25eb87 Merge remote-tracking branch 'origin/feature/sso-server-merge-1228' into feature/sso-server-merge-1228 2022-12-29 17:30:25 +08:00
zhangzhiqiang
da0a72cf68 Merge remote-tracking branch 'origin/master' into feature/sso-server-merge-1228 2022-12-29 17:29:18 +08:00
bd2d44eaf0 Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso-server-merge-1228 2022-12-29 17:28:02 +08:00
eeaf69f928 sql 2022-12-29 17:27:49 +08:00
zhangzhiqiang
a3e8073f9a mdf:个人中心页面 2022-12-29 17:26:00 +08:00
0d3e7852b4 sql 2022-12-29 17:09:53 +08:00
zhangzhiqiang
e5b40787c8 add:sql 2022-12-29 17:04:41 +08:00
zhangzhiqiang
84091c5177 合并分支 2022-12-29 17:00:06 +08:00
zhangzhiqiang
8537449ce6 合并sso分支 2022-12-29 15:08:11 +08:00
zhangzhiqiang
d6ce08df7d 合并分支sso 2022-12-29 15:04:15 +08:00