 lwl0608
|
601ef2b715
|
Merge branch 'dev-lwl/order' into test
|
2024-05-15 19:58:18 +08:00 |
|
lwl0608
|
ce579b9701
|
add log
|
2024-05-15 19:57:52 +08:00 |
 Leufolium
|
757ca5edc6
|
Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf
|
2024-05-15 16:32:37 +08:00 |
|
Leufolium
|
c0698c2da3
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin
|
2024-05-15 16:30:50 +08:00 |
|
Leufolium
|
5016e7b7be
|
by Robin at 20240515
|
2024-05-15 16:07:33 +08:00 |
|
Leufolium
|
0e6368fc0c
|
by Robin at 20240515
|
2024-05-15 12:13:02 +08:00 |
|
Leufolium
|
7107bb0393
|
by Robin at 20240515
|
2024-05-15 09:58:45 +08:00 |
|
chenhao
|
6dc7bf2d66
|
Merge pull request 'by Robin at 20240514' (#439) from feat-IRONFANS-121-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/439
|
2024-05-15 08:41:58 +08:00 |
|
chenhao
|
c63219ac5c
|
Merge pull request 'main' (#433) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/433
|
2024-05-14 20:48:08 +08:00 |
|
chenhao
|
e44b89cee8
|
Merge pull request 'by Robin at 20240514' (#432) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/432
|
2024-05-14 20:47:34 +08:00 |
|
Leufolium
|
4130795c11
|
by Robin at 20240514
|
2024-05-14 20:47:20 +08:00 |
|
chenhao
|
1c6cfa8874
|
Merge pull request 'by Robin at 20240514' (#429) from feat-IRONFANS-121-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/429
|
2024-05-14 17:23:12 +08:00 |
|
Leufolium
|
3dc9ca1665
|
by Robin at 20240514
|
2024-05-14 17:22:40 +08:00 |
|
lwl0608
|
961f37af1b
|
fix
|
2024-05-14 10:58:07 +08:00 |
|
lwl0608
|
4bf3a744b3
|
本周迭代
|
2024-05-14 10:55:49 +08:00 |
|
lwl0608
|
77bb52fe88
|
create_order
|
2024-05-14 09:52:23 +08:00 |
|
chenhao
|
36cc467854
|
Merge pull request 'feat-IRONFANS-117-Robin' (#428) from feat-IRONFANS-117-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/428
|
2024-05-13 12:28:45 +08:00 |
|
chenhao
|
5ffd2d6085
|
Merge pull request 'by Robin at 20240512' (#427) from feat-IRONFANS-114-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/427
|
2024-05-12 16:16:43 +08:00 |
|
Leufolium
|
5cf69a9244
|
by Robin at 20240512
|
2024-05-12 16:16:14 +08:00 |
|
Leufolium
|
f6ee79f147
|
by Robin at 20240511
|
2024-05-11 19:29:33 +08:00 |
|
Leufolium
|
9fb394d82a
|
by Robin at 20240511
|
2024-05-11 11:34:37 +08:00 |
|
Leufolium
|
2c9e1cdb91
|
by Robin at 20240511
|
2024-05-11 10:22:32 +08:00 |
|
lwl0608
|
8035970300
|
w
|
2024-05-11 00:04:34 +08:00 |
|
lwl0608
|
22b28535a8
|
w
|
2024-05-11 00:04:06 +08:00 |
|
chenhao
|
1659bace4e
|
Merge pull request 'main' (#424) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/424
|
2024-05-10 22:26:59 +08:00 |
|
Leufolium
|
0ef3755334
|
Merge branch 'main' into feat-IRONFANS-117-Robin
|
2024-05-10 18:56:35 +08:00 |
|
Leufolium
|
828447ed3f
|
by Robin at 20240510
|
2024-05-10 18:46:52 +08:00 |
|
Leufolium
|
c3c313dfa6
|
by Robin at 20240510
|
2024-05-10 18:13:57 +08:00 |
|
Leufolium
|
d1fcc7da5c
|
by Robin at 20240510
|
2024-05-10 18:11:36 +08:00 |
|
lwl0608
|
e7c977660d
|
Merge branch 'dev-lwl/fix_witdraw' into test
|
2024-05-10 10:17:21 +08:00 |
|
lwl0608
|
6a7ff7a8ff
|
add withdraw
|
2024-05-10 10:17:07 +08:00 |
|
lwl0608
|
48a728c345
|
Merge branch 'dev-lwl/refund_coin_order' into test
|
2024-05-09 20:30:42 +08:00 |
|
lwl0608
|
f11e7e15ae
|
fix price
|
2024-05-09 20:30:20 +08:00 |
|
lwl0608
|
b7c274feec
|
Merge branch 'dev-lwl/refund_coin_order' into test
|
2024-05-09 19:54:14 +08:00 |
|
lwl0608
|
ef3a1dde14
|
fix price
|
2024-05-09 19:53:19 +08:00 |
|
chenhao
|
66ccd3aa64
|
Merge pull request 'by Robin at 20240509' (#420) from feat-IRONFANS-114-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/420
|
2024-05-09 18:07:29 +08:00 |
|
Leufolium
|
06227bd983
|
by Robin at 20240509
|
2024-05-09 18:07:05 +08:00 |
|
Leufolium
|
ec8e81a745
|
Merge remote-tracking branch 'origin/feat-IRONFANS-114-Robin' into conflict
|
2024-05-09 17:28:37 +08:00 |
|
Leufolium
|
67851d0dae
|
by Robin at 20240509
|
2024-05-09 17:24:56 +08:00 |
|
Leufolium
|
edc907aadb
|
by Robin at 20240509
|
2024-05-09 01:55:43 +08:00 |
|
Leufolium
|
56ceb91a45
|
Merge branch 'main' of http://121.41.31.146:3000/wishpal_ironfan/service
|
2024-05-09 01:19:15 +08:00 |
|
Leufolium
|
55c62a8fda
|
by Robin at 20240509
|
2024-05-09 01:19:14 +08:00 |
|
chenhao
|
283704cd81
|
Merge pull request 'by Robin at 20240509' (#415) from BUG-RELATION-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/415
|
2024-05-09 00:02:34 +08:00 |
|
Leufolium
|
ed70c08149
|
by Robin at 20240509
|
2024-05-09 00:02:16 +08:00 |
|
chenhao
|
ae26ca61b5
|
Merge pull request 'feat-IRONFANS-112-Robin' (#414) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/414
|
2024-05-08 22:55:36 +08:00 |
|
Leufolium
|
0614fd84e2
|
by Robin at 20240508
|
2024-05-08 22:55:15 +08:00 |
|
Leufolium
|
cb773295f4
|
t
|
2024-05-08 22:54:05 +08:00 |
|
Leufolium
|
4dc6850883
|
by Robin at 20240508
|
2024-05-08 22:53:24 +08:00 |
|
chenhao
|
8f03f31def
|
Merge pull request 'by Robin at 20240508' (#413) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/413
|
2024-05-08 20:49:26 +08:00 |
|
Leufolium
|
1a26469760
|
by Robin at 20240508
|
2024-05-08 20:49:11 +08:00 |