Commit Graph

643 Commits

Author SHA1 Message Date
eson
586e02c842 info address used 2023-10-07 16:59:52 +08:00
laodaming
560bc9a7d2 fix 2023-10-07 16:58:22 +08:00
momo
2261421ba5 fix调整 2023-10-07 13:33:40 +08:00
laodaming
cc6da9a648 fix 2023-10-07 10:13:15 +08:00
eson
de751d5d68 info address used 2023-09-28 17:27:52 +08:00
eson
649e635d17 info get profile 2023-09-28 16:54:10 +08:00
eson
316ebd9fca info get profile 2023-09-28 15:19:45 +08:00
eson
6072341a2b info get profile 2023-09-28 14:42:26 +08:00
eson
1f9123c0f4 info get profile 2023-09-28 13:32:37 +08:00
eson
91bc3310a1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-28 13:25:12 +08:00
eson
d92c77766c info get profile 2023-09-28 13:25:06 +08:00
momo
39efb7eefb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 17:24:05 +08:00
momo
fef541dfe5 fix:支付 2023-09-27 17:23:58 +08:00
laodaming
b6d0ef1c7c fix 2023-09-27 16:36:38 +08:00
laodaming
1dfa390557 fix 2023-09-27 16:16:33 +08:00
eson
0a8f3cd5ba info get profile 2023-09-27 15:47:40 +08:00
eson
89e8b4cff9 info get profile 2023-09-27 15:46:35 +08:00
laodaming
2ac507ef34 fix 2023-09-27 14:14:16 +08:00
laodaming
59114aa94a fix 2023-09-27 14:13:34 +08:00
laodaming
d5e5f7e6e2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 14:05:34 +08:00
laodaming
02f2e08329 fix 2023-09-27 14:05:26 +08:00
eson
3dc822fcde info get profile 2023-09-27 12:28:53 +08:00
eson
d61e939685 info get profile 2023-09-27 12:24:47 +08:00
eson
fe57705286 info get profile 2023-09-27 12:23:02 +08:00
eson
b4f201eb98 info get profile 2023-09-27 12:18:16 +08:00
eson
943eba6f1a info get profile 2023-09-27 12:12:28 +08:00
eson
82ce9a5114 info get profile 2023-09-27 12:04:53 +08:00
eson
53446bb606 info get profile 2023-09-27 11:55:21 +08:00
eson
945a8ec83c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 11:51:28 +08:00
eson
5fcd76e32e info get profile 2023-09-27 11:51:24 +08:00
laodaming
4ea3487043 fix 2023-09-27 11:48:15 +08:00
eson
9de1099b12 info get profile 2023-09-27 11:35:34 +08:00
eson
899db716f1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 11:30:22 +08:00
eson
2eadff7876 info get profile 2023-09-27 11:30:17 +08:00
laodaming
ab916ac13d fix 2023-09-27 11:13:37 +08:00
momo
6c53238457 fix:支付 2023-09-27 10:12:52 +08:00
momo
1203c087d8 fix:支付 2023-09-26 18:18:48 +08:00
eson
93b0cadea9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 17:16:15 +08:00
eson
f387e46977 info get profile 2023-09-26 17:16:10 +08:00
momo
9e6f919fa8 fix:支付 2023-09-26 16:53:34 +08:00
momo
f20b4fad3e fix:支付 2023-09-26 16:16:58 +08:00
momo
c7a2cf7d1c fix:支付 2023-09-26 15:14:08 +08:00
eson
31debda97f info update profile 2023-09-26 15:02:09 +08:00
eson
f9595aad3f info fix table 2023-09-26 13:31:42 +08:00
eson
1e444ca616 info delete table 2023-09-26 13:23:49 +08:00
eson
407ba29319 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 12:24:14 +08:00
eson
c42c37f65e info address 2023-09-26 12:24:09 +08:00
momo
cdeec5a4e1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 12:21:30 +08:00
momo
94088b5aa4 fix:支付 2023-09-26 12:21:26 +08:00
laodaming
01cc115a60 fix 2023-09-26 11:40:27 +08:00
eson
47a1ecfc79 info address 2023-09-26 11:32:43 +08:00
eson
55a4526536 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 11:21:48 +08:00
eson
7eab65be87 info address 2023-09-26 11:21:43 +08:00
laodaming
fc302ad1be Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 11:11:58 +08:00
eson
87c2d7bf96 info address 2023-09-26 11:11:34 +08:00
laodaming
27f429cdec Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 11:11:27 +08:00
laodaming
f615e4fe77 fix 2023-09-26 11:10:41 +08:00
eson
87ff25a2e6 info address 2023-09-26 11:08:32 +08:00
eson
a832a6fa81 info address 2023-09-26 11:07:45 +08:00
eson
0e282e741b info address 2023-09-26 11:06:37 +08:00
eson
d0323646c5 info address 2023-09-26 11:05:31 +08:00
eson
2331979b65 info address 2023-09-26 11:04:12 +08:00
eson
c12675698b info address 2023-09-26 11:01:42 +08:00
eson
3bba720f67 info address 2023-09-26 10:58:24 +08:00
b03e2d020f info address 2023-09-26 00:02:50 +08:00
laodaming
cb9b8ed6fd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 18:44:54 +08:00
laodaming
7490a3b324 fix 2023-09-25 18:44:47 +08:00
eson
3f4b341c33 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-25 18:42:53 +08:00
eson
cef9dfa34d info 2023-09-25 18:42:45 +08:00
laodaming
f713124154 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 17:21:37 +08:00
laodaming
4bbe9aaaa3 fix 2023-09-25 17:20:44 +08:00
eson
8fe6e8be74 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-25 15:58:40 +08:00
eson
f2a0c7608e info 2023-09-25 15:58:33 +08:00
laodaming
29c7dc54e3 fix 2023-09-25 15:49:59 +08:00
laodaming
d8d91e9270 fix 2023-09-25 11:34:53 +08:00
laodaming
02b3788dc9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-25 11:17:03 +08:00
laodaming
a7f21da8da fix 2023-09-25 11:16:55 +08:00
momo
656d5038fe fix:支付 2023-09-22 17:32:23 +08:00
momo
b398da58e1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-22 16:27:21 +08:00
momo
7e400ed761 fix:支付 2023-09-22 16:27:17 +08:00
eson
1bd2b83bca info 2023-09-22 15:52:20 +08:00
eson
b3ed5703a8 info 2023-09-22 15:42:09 +08:00
eson
4005af2040 info 2023-09-22 14:34:23 +08:00
c4b4b72947 fix 2023-09-22 00:46:05 +08:00
99f785a7c3 fix 2023-09-22 00:35:10 +08:00
c280a661a1 fix 2023-09-22 00:31:58 +08:00
b37c2094ed fix 2023-09-22 00:28:35 +08:00
6260d29dc7 fix 2023-09-22 00:21:18 +08:00
7aa4a57257 fix 2023-09-22 00:18:04 +08:00
7324aabbd6 fix 2023-09-22 00:12:23 +08:00
0b8f6e69cf fix 2023-09-22 00:03:01 +08:00
bd1b6ee23e fix 2023-09-21 23:59:01 +08:00
58e2068170 fix 2023-09-21 23:47:34 +08:00
45ef0b8bc9 fix 2023-09-21 23:39:15 +08:00
ff011f6452 fix 2023-09-21 23:32:58 +08:00
d3c96184b8 fix 2023-09-21 23:21:57 +08:00
momo
046c31c898 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 19:02:05 +08:00
momo
be786a4d4c fix:支付 2023-09-21 19:01:48 +08:00
eson
edb1b0c0f2 nacos config 2023-09-21 18:59:47 +08:00
eson
822a2163a0 nacos config 2023-09-21 18:57:18 +08:00
eson
dc489b1ca3 nacos config 2023-09-21 18:53:04 +08:00
eson
68bd764c6e nacos config 2023-09-21 18:26:13 +08:00
eson
14f4f959d6 nacos config 2023-09-21 18:21:00 +08:00
eson
11cdcefa4c nacos config 2023-09-21 18:12:22 +08:00
momo
30ae7eb814 fix:订单详情 2023-09-21 12:11:15 +08:00
laodaming
37fc648025 Merge branch 'develop' into feature/mhw-v1.01 2023-09-21 11:15:56 +08:00
momo
4f61702e14 fix:购物车下单 2023-09-21 10:30:36 +08:00
laodaming
d4b1d78201 fix 2023-09-20 18:06:21 +08:00
momo
137919a4d7 fix:购物车下单 2023-09-20 18:04:33 +08:00
eson
7383d60bfe Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-20 17:36:25 +08:00
laodaming
18aaef0e31 fix 2023-09-20 17:11:48 +08:00
eson
20932677ad Merge branch 'feature/mhw-v1.01' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-20 17:01:28 +08:00
laodaming
be80525878 11 2023-09-20 16:46:30 +08:00
momo
4d3f1512ac fix:购物车下单 2023-09-20 16:37:37 +08:00
laodaming
5042971472 11 2023-09-20 15:52:34 +08:00
momo
d59142e017 fix:购物车下单 2023-09-20 15:39:23 +08:00
momo
e8958599ac fix:购物车下单 2023-09-20 15:37:22 +08:00
momo
359e67e281 fix:购物车下单 2023-09-20 15:35:40 +08:00
laodaming
143421557f fix 2023-09-20 15:28:57 +08:00
laodaming
a5f5a83fe8 fix 2023-09-20 15:21:42 +08:00
momo
ed5dce9ff0 fix:购物车下单 2023-09-20 15:07:12 +08:00
momo
ca12242768 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 11:40:06 +08:00
momo
b45da2b637 fix:购物车下单 2023-09-20 11:39:56 +08:00
laodaming
86c39263be 添加购物车新增灯光信息保存 2023-09-20 10:31:36 +08:00
momo
f4f5a62270 fix:购物车下单 2023-09-19 19:17:04 +08:00
momo
12085dca8f fix:购物车下单 2023-09-19 13:56:59 +08:00
momo
eb49aa9f3e fix:购物车下单 2023-09-18 15:39:59 +08:00
momo
8265140148 fix:购物车下单 2023-09-18 15:39:12 +08:00
laodaming
464218ad62 Merge branch 'develop' into feature/mhw-v1.01 2023-09-18 14:44:28 +08:00
laodaming
1a7ce5013e fix 2023-09-18 12:31:51 +08:00
532b35b864 Merge branch 'feature/mhw-v1.01' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-16 20:15:24 +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
momo
ca7cf4c81e fix:合并 2023-09-15 17:58:45 +08:00
laodaming
da8f88b3e6 fix 2023-09-15 16:30:01 +08:00
laodaming
6987f2c2d1 fix 2023-09-15 15:27:39 +08:00
laodaming
fd16d6ac67 fix 2023-09-15 14:19:14 +08:00
eson
c1991351cf 更新表结构 2023-09-15 11:20:49 +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
6e89f318fd Merge branch 'ldm-v1.01' into feature/mhw-v1.01 2023-09-15 10:25:02 +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
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
eson
0c3514d709 fix 2023-09-14 14:59:44 +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
f08c51e5bc fix 2023-09-13 17:21:56 +08:00
laodaming
9e4703bd1f fix 2023-09-13 16:44:23 +08:00
laodaming
6ec89bc13a 11 2023-09-13 16:06:05 +08:00
laodaming
63669fe466 11 2023-09-13 16:04:59 +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
cc7fcb2133 fix 2023-09-11 13:05:31 +08:00
71352cc5b9 fix 2023-09-10 03:11:35 +08:00
5bedfc9237 fix 2023-09-10 03:09:48 +08:00
14f0dd2b22 测试接口成功 2023-09-10 02:58:56 +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
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
1f28a64442 fix 2023-09-08 18:49:56 +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
b7882ef06f fix 2023-09-08 14:25:47 +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
eson
a4363d0a47 fix 2023-09-08 11:08:13 +08:00
eson
9ad045c8f4 fix 2023-09-08 10:52:51 +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
751e0e6e6b fix:logo历史列表调整 2023-09-07 16:25:29 +08:00
momo
ba0f1e1ba2 fix:资源管理 2023-09-07 11:28:06 +08:00
eson
88a8e73943 fix 2023-09-06 18:35:57 +08:00
eson
f84a677050 fix 2023-09-06 17:10:37 +08:00
eson
b23e907871 fix 2023-09-06 16:33:24 +08:00
eson
dc7b590977 fix 2023-09-06 16:21:21 +08:00
eson
67230a58bf fix 2023-09-06 12:29:34 +08:00
eson
bd5fdbdbd3 fix 2023-09-06 12:17:40 +08:00
laodaming
d2bb801fb4 fix 2023-09-05 18:29:44 +08:00
laodaming
262c8dc1b5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-05 16:35:10 +08:00
laodaming
4fbbbb27df fix 2023-09-05 16:35:02 +08:00
eson
d9de812728 fix 2023-09-05 16:16:57 +08:00
eson
3533a96b56 fix 2023-09-05 15:23:43 +08:00
laodaming
2f839ac85b fix 2023-09-05 10:53:18 +08:00
laodaming
2668c232b1 fix 2023-09-04 18:54:03 +08:00
laodaming
a6bd0cc6dd fix 2023-09-01 15:55:22 +08:00
laodaming
b64131dfe5 fix 2023-09-01 15:48:47 +08:00
momo
372b98bcee fix:优化 2023-09-01 15:04:18 +08:00
momo
2d62681600 fix:修改用户素材表时间结构 2023-09-01 10:27:28 +08:00
laodaming
0cabd3d284 fix 2023-08-31 11:50:55 +08:00