lwl0608
|
f12a1ad2a2
|
fix coin order
|
2024-04-29 16:24:59 +08:00 |
lwl0608
|
f575f381e6
|
fix coin order
|
2024-04-29 16:23:03 +08:00 |
lwl0608
|
1b17cf1a79
|
Merge branch 'dev-lwl/zone' into test
|
2024-04-29 16:08:59 +08:00 |
lwl0608
|
cc7a910b72
|
fix zone ferund
|
2024-04-29 16:08:51 +08:00 |
lwl0608
|
31c2dc1039
|
Merge branch 'dev-lwl/zone' into test
|
2024-04-29 15:56:49 +08:00 |
lwl0608
|
a8d3a45b71
|
rollback ironfanship
|
2024-04-29 15:56:42 +08:00 |
lwl0608
|
1bd1cfd161
|
Merge branch 'dev-lwl/zone' into test
|
2024-04-29 15:47:56 +08:00 |
lwl0608
|
c470a8e77f
|
add zone refund
|
2024-04-29 15:47:45 +08:00 |
chenhao
|
8ae3052741
|
Merge pull request 'feat-IRONFANS-86-Robin' (#377) from feat-IRONFANS-86-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/377
|
2024-04-29 15:32:43 +08:00 |
Leufolium
|
b67c503e80
|
by Robin at 20240429
|
2024-04-29 15:31:54 +08:00 |
chenhao
|
1313f17fe0
|
Merge pull request 'by Robin at 20240429' (#376) from feat-IRONFANS-87-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/376
|
2024-04-29 14:25:16 +08:00 |
chenhao
|
a167a0ddff
|
Merge pull request 'by Robin at 20240429' (#375) from feat-IRONFANS-87-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/375
|
2024-04-29 14:25:08 +08:00 |
Leufolium
|
29f4a72c32
|
by Robin at 20240429
|
2024-04-29 14:24:31 +08:00 |
chenhao
|
06624dc801
|
Merge pull request 'by Robin at 20240429' (#374) from feat-IRONFANS-87-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/374
|
2024-04-29 14:18:23 +08:00 |
chenhao
|
db6176f021
|
Merge pull request 'by Robin at 20240429' (#373) from feat-IRONFANS-87-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/373
|
2024-04-29 14:17:55 +08:00 |
Leufolium
|
f6c60cf574
|
by Robin at 20240429
|
2024-04-29 14:17:29 +08:00 |
chenhao
|
419e3fb0f3
|
Merge pull request 'feat-IRONFANS-87-Robin' (#372) from feat-IRONFANS-87-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/372
|
2024-04-28 22:03:48 +08:00 |
chenhao
|
d24b4380a4
|
Merge pull request 'by Robin at 20240428' (#371) from feat-IRONFANS-87-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/371
|
2024-04-28 21:51:32 +08:00 |
Leufolium
|
58a238e9c9
|
by Robin at 20240428
|
2024-04-28 21:51:16 +08:00 |
chenhao
|
1810864112
|
Merge pull request 'by Robin at 20240428' (#370) from feat-IRONFANS-87-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/370
|
2024-04-28 21:33:38 +08:00 |
Leufolium
|
217a53d6b2
|
by Robin at 20240428
|
2024-04-28 21:33:24 +08:00 |
chenhao
|
cab56b3a51
|
Merge pull request 'by Robin at 20240428' (#369) from feat-IRONFANS-87-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/369
|
2024-04-28 21:33:06 +08:00 |
Leufolium
|
24735fa03e
|
by Robin at 20240428
|
2024-04-28 21:32:52 +08:00 |
chenhao
|
e56dd98007
|
Merge pull request 'feat-IRONFANS-87-Robin' (#368) from feat-IRONFANS-87-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/368
|
2024-04-28 21:27:24 +08:00 |
Leufolium
|
442b84a0cd
|
by Robin at 20240428
|
2024-04-28 21:26:59 +08:00 |
Leufolium
|
e8649e1111
|
BY ROBIN AT 20240428
|
2024-04-28 21:16:18 +08:00 |
lwl0608
|
53bfdfe33c
|
Merge branch 'dev-lwl/zone' into test
|
2024-04-28 18:00:17 +08:00 |
lwl0608
|
8db2ce1071
|
fix
|
2024-04-28 17:59:57 +08:00 |
lwl0608
|
9509d63858
|
Merge branch 'main' into test
|
2024-04-28 17:37:04 +08:00 |
chenhao
|
6bf1f9e472
|
Merge pull request 'by Robin at 20240427' (#367) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/367
|
2024-04-27 19:50:09 +08:00 |
Leufolium
|
e8ddb5bb9e
|
by Robin at 20240427
|
2024-04-27 19:49:56 +08:00 |
Leufolium
|
27cda44de3
|
by Robin at 20240427
|
2024-04-27 19:48:57 +08:00 |
chenhao
|
d720f45284
|
Merge pull request 'by Robin at 20240427' (#366) from feat-IRONFANS-88-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/366
|
2024-04-27 17:23:19 +08:00 |
Leufolium
|
3ccfbf0e76
|
by Robin at 20240427
|
2024-04-27 17:23:04 +08:00 |
chenhao
|
007cef3d1a
|
revert 7dd5e042ca
revert by Robin at 20240427
|
2024-04-27 17:22:02 +08:00 |
Leufolium
|
7dd5e042ca
|
by Robin at 20240427
|
2024-04-27 17:19:46 +08:00 |
chenhao
|
0c86d4db01
|
Merge pull request 'feat-IRONFANS-86-Robin' (#365) from feat-IRONFANS-86-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/365
|
2024-04-27 11:17:19 +08:00 |
Leufolium
|
edb5caf001
|
by Robin at 20240427
|
2024-04-27 11:14:44 +08:00 |
Leufolium
|
b53a96d3bf
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin
|
2024-04-27 08:27:34 +08:00 |
chenhao
|
d1d64c07d4
|
Merge pull request 'conflict' (#364) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/364
|
2024-04-27 08:25:17 +08:00 |
Leufolium
|
acf047e66f
|
Merge remote-tracking branch 'origin/main' into conflict
|
2024-04-27 08:24:56 +08:00 |
chenhao
|
1ef6478056
|
Merge pull request 'by Robin at 20240427' (#362) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/362
|
2024-04-27 08:21:01 +08:00 |
Leufolium
|
14d86ae777
|
by Robin at 20240427
|
2024-04-27 08:20:19 +08:00 |
chenhao
|
79df3e410e
|
Merge pull request 'feat-IRONFANS-70' (#360) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/360
|
2024-04-27 00:48:29 +08:00 |
chenhao
|
6376fc0d48
|
Merge pull request 'by Robin at 20240427' (#359) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/359
|
2024-04-27 00:47:36 +08:00 |
Leufolium
|
2f4a80d3fc
|
by Robin at 20240427
|
2024-04-27 00:47:18 +08:00 |
chenhao
|
a008fa9e86
|
Merge pull request 'by Robin at 20240427' (#358) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/358
|
2024-04-27 00:39:49 +08:00 |
Leufolium
|
9a5968f158
|
by Robin at 20240427
|
2024-04-27 00:39:28 +08:00 |
chenhao
|
0562e5cdc5
|
Merge pull request 'by Robin at 20240427' (#357) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/357
|
2024-04-27 00:28:34 +08:00 |
Leufolium
|
9fed951998
|
by Robin at 20240427
|
2024-04-27 00:27:53 +08:00 |