Commit Graph

700 Commits

Author SHA1 Message Date
chenhao 83b4ed0320 Merge pull request 'by Robin at 20240501' (#396) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/396
2024-05-01 03:53:15 +08:00
Leufolium 74e6f9a9f5 by Robin at 20240501 2024-05-01 03:52:59 +08:00
chenhao a0dac18ede Merge pull request 'feat-IRONFANS-70' (#395) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/395
2024-05-01 03:28:28 +08:00
Leufolium c82974fadf Merge remote-tracking branch 'origin/main' into conf 2024-05-01 03:27:04 +08:00
Leufolium 6824e26e90 by Robin at 20240501 2024-05-01 03:22:06 +08:00
Leufolium d494eb921b by Robin at 20240501 2024-05-01 02:51:47 +08:00
chenhao e2501b7022 Merge pull request 'by Robin at 20240501' (#390) from feat-IRONFANS-86-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/390
2024-05-01 01:11:22 +08:00
Leufolium d642ca7dc0 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-05-01 01:11:00 +08:00
Leufolium 6158600853 by Robin at 20240501 2024-05-01 01:04:50 +08:00
Leufolium 7e71e670c0 Merge branch 'feat-IRONFANS-70' into conflict 2024-04-30 09:52:51 +08:00
Leufolium 1ac73882d1 by Robin at 20240430 2024-04-30 09:51:23 +08:00
Leufolium aa32674ed3 by Robin at 20240430 2024-04-30 09:40:19 +08:00
chenhao b0fc62679e Merge pull request 'by Robin at 20240430' (#385) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/385
2024-04-30 09:23:24 +08:00
Leufolium 7f18d00df4 by Robin at 20240430 2024-04-30 09:22:18 +08:00
chenhao edbcabb372 Merge pull request 'feat-IRONFANS-86-Robin' (#384) from feat-IRONFANS-86-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/384
2024-04-29 22:37:25 +08:00
chenhao a3c29a0c6b Merge pull request 'feat-IRONFANS-86-Robin' (#383) from feat-IRONFANS-86-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/383
2024-04-29 22:37:06 +08:00
Leufolium 07aff915c0 b 2024-04-29 22:36:45 +08:00
chenhao c366a96735 Merge pull request 'by Robin at 20240429' (#381) from feat-IRONFANS-86-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/381
2024-04-29 22:32:32 +08:00
chenhao 9356387298 Merge pull request 'by Robin at 20240429' (#380) from feat-IRONFANS-86-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/380
2024-04-29 22:32:05 +08:00
Leufolium bd0fb55e8e by Robin at 20240429 2024-04-29 22:31:27 +08:00
chenhao bee0278f38 Merge pull request 'by Robin at 20240429' (#379) from feat-IRONFANS-86-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/379
2024-04-29 22:21:38 +08:00
chenhao 9c893d4a9c Merge pull request 'feat-IRONFANS-86-Robin' (#378) from feat-IRONFANS-86-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/378
2024-04-29 22:20:05 +08:00
Leufolium 86bc5933e4 by Robin at 20240429 2024-04-29 22:17:19 +08:00
lwl0608 0e8beef47b Merge branch 'dev-lwl/zone' into test 2024-04-29 17:53:01 +08:00
lwl0608 924656e8ed contact 2024-04-29 17:52:52 +08:00
lwl0608 3dc8a84b7c Merge branch 'dev-lwl/zone' into test 2024-04-29 17:39:59 +08:00
lwl0608 715ff91c51 zone_refund_list 2024-04-29 17:39:49 +08:00
lwl0608 9e4a6e744a Merge branch 'dev-lwl/zone' into test 2024-04-29 16:25:30 +08:00
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 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 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
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 27cda44de3 by Robin at 20240427 2024-04-27 19:48:57 +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