Commit Graph

1493 Commits

Author SHA1 Message Date
laodaming
17117191f0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-19 11:42:17 +08:00
laodaming
c0b773634a 合并develop 2023-09-19 11:42:10 +08:00
eson
b4672bbed7 nacos config 2023-09-19 11:41:38 +08:00
laodaming
4e0a484e7f fix 2023-09-19 10:59:53 +08:00
laodaming
dc4f6dda50 fix 2023-09-19 10:56:30 +08:00
laodaming
88d06f68f6 fix 2023-09-19 10:53:48 +08:00
laodaming
93e95d1a15 fix 2023-09-19 10:41:15 +08:00
laodaming
19958a80de fix 2023-09-19 10:36:33 +08:00
laodaming
34befce2f3 fix 2023-09-19 10:18:17 +08:00
laodaming
498f4550f0 fix 2023-09-19 10:09:22 +08:00
laodaming
157f05e43d fix 2023-09-19 10:04:35 +08:00
laodaming
3de3d896e8 fix 2023-09-18 19:06:46 +08:00
laodaming
bdef106f09 fix 2023-09-18 19:03:52 +08:00
laodaming
389794500f fix 2023-09-18 18:59:29 +08:00
laodaming
66f0f2dffa Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-18 18:46:26 +08:00
laodaming
f82f8b0d24 fix 2023-09-18 18:46:18 +08:00
eson
3ff55f671e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-18 18:44:40 +08:00
eson
beaba9afa9 更新 config 最新配置服务上去 2023-09-18 18:44:12 +08:00
laodaming
c12c24d03b fix 2023-09-18 18:18:30 +08:00
laodaming
49785df983 fix 2023-09-18 17:53:05 +08:00
laodaming
49cc50ff4e fix 2023-09-18 15:57:36 +08:00
laodaming
990c7d3359 fix 2023-09-18 15:19:42 +08:00
laodaming
ceec00c528 fix 2023-09-18 15:18:55 +08:00
laodaming
9476414e68 fix 2023-09-18 14:53:15 +08:00
laodaming
464218ad62 Merge branch 'develop' into feature/mhw-v1.01 2023-09-18 14:44:28 +08:00
laodaming
5e2760849c fix 2023-09-18 14:23:57 +08:00
laodaming
1a7ce5013e fix 2023-09-18 12:31:51 +08:00
laodaming
b07473478b fix 2023-09-18 11:45:29 +08:00
momo
87347515d1 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 18:30:50 +08:00
laodaming
43c34159ce fix 2023-09-15 18:19:01 +08:00
momo
86450d3c9d Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 17:59:59 +08:00
laodaming
ab6f3249a2 fix 2023-09-15 17:59:33 +08:00
momo
751232c32e Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 17:59:04 +08:00
laodaming
da8f88b3e6 fix 2023-09-15 16:30:01 +08:00
laodaming
668db55e6b fix 2023-09-15 15:54:24 +08:00
laodaming
c94e59c907 fix 2023-09-15 15:54:12 +08:00
laodaming
33055bbb4c fix 2023-09-15 15:28:42 +08:00
laodaming
246e03d792 fix 2023-09-15 15:28:11 +08:00
laodaming
6987f2c2d1 fix 2023-09-15 15:27:39 +08:00
laodaming
ee92468392 fix 2023-09-15 14:52:36 +08:00
laodaming
f72a0b9f7d fix 2023-09-15 14:20:08 +08:00
laodaming
fd16d6ac67 fix 2023-09-15 14:19:14 +08:00
laodaming
dd13dcbf0d fix 2023-09-15 10:39:08 +08:00
momo
e4343eb2d6 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 10:35:56 +08:00
momo
f3a29225e0 fix:合并 2023-09-15 10:35:13 +08:00
laodaming
5df0a0f184 fix 2023-09-15 10:23:40 +08:00
momo
6606173050 feat:新增api 2023-09-14 18:43:10 +08:00
laodaming
440dd1cefc fix 2023-09-14 18:40:37 +08:00
laodaming
9c178b2add fix 2023-09-14 18:33:29 +08:00
laodaming
0bb11f975d 新增更新购物车购买数量接口 2023-09-14 15:46:37 +08:00
laodaming
b71141807b 新增添加购物车接口 2023-09-14 15:20:37 +08:00
laodaming
dff1ebe013 Merge branch 'develop' into ldm-v1.01 2023-09-14 15:04:16 +08:00
laodaming
93795ed6d2 11 2023-09-14 14:57:16 +08:00
laodaming
794c416267 11 2023-09-14 14:41:18 +08:00
laodaming
46ee5a94bd fix 2023-09-14 14:17:19 +08:00
laodaming
13d5219e53 fix 2023-09-14 14:11:22 +08:00
laodaming
f56946fce9 新增添加购物车接口 2023-09-13 18:37:50 +08:00
laodaming
b8edd41e69 增加购物车服务 2023-09-13 17:33:58 +08:00
laodaming
fec2ea5789 fix 2023-09-13 17:27:36 +08:00
laodaming
a8b85fad02 fix 2023-09-13 17:27:16 +08:00
laodaming
63669fe466 11 2023-09-13 16:04:59 +08:00
laodaming
190ac0407e 11 2023-09-13 13:59:01 +08:00
laodaming
d34d72a5cc 11 2023-09-13 10:52:18 +08:00
laodaming
5c47a30347 11 2023-09-13 10:48:53 +08:00
laodaming
411aeb2762 11 2023-09-13 10:46:43 +08:00
laodaming
7e8f445169 11 2023-09-13 10:42:33 +08:00
laodaming
06b1ad1678 11 2023-09-13 10:29:59 +08:00
laodaming
0aef122f1b 11 2023-09-12 18:09:38 +08:00
laodaming
df73e8d5ce 11 2023-09-12 17:59:07 +08:00
laodaming
dd123cc446 11 2023-09-12 17:44:12 +08:00
laodaming
ef946ed0e8 11 2023-09-12 17:26:44 +08:00
laodaming
4a09fc3955 11 2023-09-12 17:05:41 +08:00
laodaming
ff656ba420 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-12 16:40:25 +08:00
laodaming
97947fed6c 11 2023-09-12 16:40:19 +08:00
momo
1699420c4a fix:合图,参数调整 2023-09-12 15:59:38 +08:00
laodaming
7c6f8c5594 11 2023-09-12 15:37:22 +08:00
laodaming
983492f7b1 11 2023-09-12 15:35:09 +08:00
laodaming
3e714a5db6 删除无用的服务 2023-09-12 15:23:41 +08:00
laodaming
a495e4e459 删除无用的服务 2023-09-12 14:31:04 +08:00
laodaming
8fc19e1fb2 删除无用的服务 2023-09-12 12:15:41 +08:00
laodaming
0a7e56f726 删除无用的服务 2023-09-12 11:57:58 +08:00
laodaming
7c3bc74186 fix 2023-09-12 11:14:06 +08:00
laodaming
0eaa357de5 fix 2023-09-12 11:05:52 +08:00
laodaming
0015ef7540 fix 2023-09-12 10:54:02 +08:00
laodaming
3fdf14c493 fix 2023-09-12 10:53:28 +08:00
laodaming
a63a473641 fix 2023-09-12 10:52:47 +08:00
laodaming
f9a53b9e36 fix 2023-09-11 18:11:53 +08:00
laodaming
e9a3b7b49c fix 2023-09-11 17:46:16 +08:00
laodaming
4eaf5b89d0 fix 2023-09-11 17:41:07 +08:00
laodaming
67c8c70feb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-11 16:20:16 +08:00
laodaming
899581ba63 fix 2023-09-11 16:20:09 +08:00
momo
21f90f3dd1 fix:合图,默认参数 2023-09-11 15:18:10 +08:00
laodaming
74f25d23cf fix 2023-09-11 15:15:38 +08:00
momo
ffc555ca76 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-11 15:02:47 +08:00
momo
e4fb6ca4a7 fix:合图,默认参数 2023-09-11 15:02:17 +08:00
laodaming
f353ad524b fix 2023-09-11 14:41:35 +08:00
laodaming
cc7fcb2133 fix 2023-09-11 13:05:31 +08:00
laodaming
2553c6c821 fix 2023-09-11 12:24:10 +08:00
laodaming
ce394848fd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-11 12:17:13 +08:00
laodaming
ac11753274 fix 2023-09-11 12:17:07 +08:00
a043823045 fix 2023-09-10 23:58:17 +08:00
467cf3c5a3 fix 2023-09-10 23:54:02 +08:00
65ccfcb84e fix 2023-09-10 23:50:42 +08:00
laodaming
00be036e59 fix 2023-09-08 19:14:01 +08:00
eson
0d72ac98a0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-08 19:11:09 +08:00
eson
b9069a8a16 fix 2023-09-08 19:11:04 +08:00
laodaming
48a6ae9888 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 19:03:13 +08:00
laodaming
bce88a3c27 fix 2023-09-08 19:03:05 +08:00
eson
c5c0479c72 fix 2023-09-08 19:02:37 +08:00
eson
692220b31b fix 2023-09-08 19:01:29 +08:00
eson
b85c7a019f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-08 18:56:22 +08:00
eson
f213f1c85a fix 2023-09-08 18:56:17 +08:00
laodaming
e6c0558679 fix 2023-09-08 18:52:57 +08:00
laodaming
eb7235281f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 18:50:04 +08:00
laodaming
1f28a64442 fix 2023-09-08 18:49:56 +08:00
momo
37e0d03de1 fix:设置当前logo 2023-09-08 18:26:23 +08:00
momo
bf9c6c9386 fix:设置当前logo 2023-09-08 18:22:44 +08:00
momo
7abcfadd93 fix:设置当前logo 2023-09-08 18:19:24 +08:00
momo
2ae8cde2ce Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 18:16:25 +08:00
momo
b329034cfc fix:设置当前logo 2023-09-08 18:16:19 +08:00
laodaming
1442b0cf64 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 17:55:04 +08:00
laodaming
a5b5dff4d2 fix 2023-09-08 17:54:57 +08:00
momo
dfd3720068 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 17:36:14 +08:00
momo
c006cdc9b9 fix:设置当前logo 2023-09-08 17:36:11 +08:00
laodaming
62256cdde9 fix 2023-09-08 16:57:32 +08:00
laodaming
b7882ef06f fix 2023-09-08 14:25:47 +08:00
laodaming
d6c43e3e94 fix 2023-09-08 14:23:34 +08:00
momo
c61c8a4933 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 11:47:59 +08:00
momo
7543f99f8b fix:设置当前logo 2023-09-08 11:47:53 +08:00
momo
6cc35e6198 feat:用户设置logo 2023-09-07 18:52:01 +08:00
eson
ac6a81dedd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-07 18:51:31 +08:00
laodaming
ea58b2316d fix 2023-09-07 18:48:48 +08:00
laodaming
c874097804 fix 2023-09-07 18:47:00 +08:00
eson
bf35122c38 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-07 18:39:36 +08:00
eson
b61a6a48f7 fix 2023-09-07 18:39:31 +08:00
laodaming
172ec53785 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 18:28:27 +08:00
laodaming
cb682a7ac0 fix 2023-09-07 18:28:19 +08:00
momo
818eee78be fix:logo历史列表调整 2023-09-07 16:54:49 +08:00
momo
b48417eee0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 16:25:57 +08:00
momo
751e0e6e6b fix:logo历史列表调整 2023-09-07 16:25:29 +08:00
laodaming
998975e413 fix 2023-09-07 16:03:56 +08:00
laodaming
35eb087b5a fix 2023-09-07 15:54:24 +08:00
laodaming
45d93b94b4 1 2023-09-07 14:06:29 +08:00
momo
d49e966bf0 fix:上传logo 2023-09-07 13:27:32 +08:00
momo
89b5111040 fix:上传logo 2023-09-07 13:26:20 +08:00
momo
acf3b9bacc fix:上传logo 2023-09-07 13:23:43 +08:00
momo
98851a41ea fix:上传logo 2023-09-07 13:10:02 +08:00
momo
b8cf209d24 fix:上传logo 2023-09-07 12:31:36 +08:00
momo
3bdc8f03d6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 12:23:22 +08:00
momo
70bda7e02c fix:上传logo 2023-09-07 12:23:19 +08:00