Commit Graph

380 Commits

Author SHA1 Message Date
zhangzhiqiang
1e59006f70 添加domain 2022-12-28 10:51:56 +08:00
zhangzhiqiang
fcafca6d41 add:后端存储token,设置domain,允许所有host 2022-12-28 09:04:48 +08:00
zhangzhiqiang
ae094ab00b 个人中心页面 2022-12-27 21:27:06 +08:00
zhangzhiqiang
66fbc90860 整合mybatis 2022-12-27 17:32:45 +08:00
zhangzhiqiang
653997a11d add mybatis 2022-12-27 15:23:44 +08:00
zhangzhiqiang
fd15fdf00b add mybatis 2022-12-27 15:01:37 +08:00
zhangzhiqiang
bfe1ba3e42 整合mybatis 2022-12-27 14:19:26 +08:00
c91b7238e0 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-26 20:16:28 +08:00
dd7d1dbbea 修改 2022-12-26 20:16:23 +08:00
c45532ac32 代码更新 2022-12-26 14:38:54 +08:00
6eefc2707b Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-26 14:38:21 +08:00
7477125799 代码更新 2022-12-26 14:38:12 +08:00
1b54fbacfe 修改 2022-12-26 09:23:31 +08:00
b5c3184f11 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-23 09:23:44 +08:00
2f59a0e74d 修改 2022-12-23 09:23:38 +08:00
97dfd2ae8f 代码更新 2022-12-23 09:22:51 +08:00
3eec6e1679 代码更新 2022-12-21 16:38:21 +08:00
3b5fd59978 修改 2022-12-20 17:24:03 +08:00
9d2dfab2e0 代码更新 2022-12-20 16:01:41 +08:00
805418eb31 代码更新 2022-12-19 17:52:29 +08:00
085ce786b7 代码更新 2022-12-19 17:14:31 +08:00
2b3b33e86f 代码更新 2022-12-19 10:37:54 +08:00
3abfc2bb36 更新代码 2022-12-17 15:58:51 +08:00
383c6437c9 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-17 11:54:53 +08:00
59dc7f04f2 修改 2022-12-17 11:54:47 +08:00
f5b7fc393a 代码更新 2022-12-17 11:50:31 +08:00
89b1ea77f8 修改 2022-12-16 11:10:50 +08:00
33e4167fa0 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-14 11:19:10 +08:00
ee08548c67 修改 2022-12-14 11:19:05 +08:00
c41358f680 代码更新 2022-12-14 11:10:47 +08:00
f87fc8e919 代码更新 2022-12-14 11:02:28 +08:00
29edd52442 代码更新 2022-12-14 11:01:49 +08:00
aa3c30c252 代码更新 2022-12-13 16:02:49 +08:00
0afeceec80 代码更新 2022-12-13 14:19:00 +08:00
da2462c188 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
2022-12-13 13:57:33 +08:00
d772e7e882 修改 2022-12-13 13:55:26 +08:00
9fac0930e2 代码更新 2022-12-13 13:42:19 +08:00
6e2ea86e49 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-13 13:41:58 +08:00
1ef6c07c2e 代码合并 2022-12-13 13:41:48 +08:00
efdcbfda0a Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-13 11:08:58 +08:00
7ac4f0c84a 修改 2022-12-13 11:08:53 +08:00
e0f1decfda 代码更新 2022-12-13 10:44:52 +08:00
82e552cbd0 代码更新 2022-12-12 20:41:29 +08:00
zhangzhiqiang
f2ba89ba3d 合并master 2022-12-12 20:41:01 +08:00
8aae513953 Merge branch 'feature/sso_function_v1205' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso_function_v1205 2022-12-12 20:19:12 +08:00
f250aff22f 代码更新 2022-12-12 20:18:56 +08:00
zhangzhiqiang
8baf7bb560 fix:修改角色菜单 2022-12-12 20:16:38 +08:00
0c37992e7c 代码更新 2022-12-12 19:49:36 +08:00
zhangzhiqiang
3360be325a fix:角色菜单接口修改 2022-12-12 18:52:18 +08:00
fbe10f98b7 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-12 18:16:25 +08:00