Commit Graph

831 Commits

Author SHA1 Message Date
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
zhangzhiqiang
b5990f168e 合并sso分支 2022-12-29 14:26:55 +08:00
3e2f71595a 代码更新 2022-12-29 14:19:49 +08:00
25782d442f 代码更新 2022-12-29 14:18:22 +08:00
c90eebe10a Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-29 13:53:01 +08:00
97ec6cc425 修改 2022-12-29 13:52:55 +08:00
5b772c0731 1 2022-12-29 10:13:14 +08:00
27f3285fb1 代码更新 2022-12-29 00:14:54 +08:00
674a7cd7fa 代码更新 2022-12-28 21:45:56 +08:00
398a702ef8 代码更新 2022-12-28 18:02:09 +08:00
db7317a220 更新 2022-12-28 17:55:01 +08:00
29e460fae8 更新 2022-12-28 16:01:12 +08:00
a9a7303a6d 代码更新 2022-12-28 15:34:39 +08:00
685015c52e 代码更新 2022-12-28 00:22:01 +08:00
0cf5eefc70 更新 2022-12-27 22:43:05 +08:00
4cce776c46 更新 2022-12-27 22:31:09 +08:00
8a4f22bd0c 代码更新 2022-12-27 20:51:28 +08:00
592ea45106 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-27 20:10:18 +08:00