 Leufolium
|
1323aef6db
|
Merge branch 'feat-IRONFANS-139-Robin' into conflict
|
2024-07-03 15:15:29 +08:00 |
|
Leufolium
|
551d420c3f
|
by Robin at 20240703
|
2024-07-03 15:13:04 +08:00 |
|
chenhao
|
1983265147
|
Merge pull request 'by Robin at 20240702' (#580) from feat-IRONFANS-158-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/580
|
2024-07-02 17:16:22 +08:00 |
|
Leufolium
|
7dcde6a448
|
by Robin at 20240702
|
2024-07-02 17:15:54 +08:00 |
|
Leufolium
|
8405d6f187
|
Merge remote-tracking branch 'origin/main' into conf
|
2024-07-01 18:00:36 +08:00 |
 lwl0608
|
f6623d9a43
|
merge
|
2024-07-01 16:01:48 +08:00 |
|
lwl0608
|
0241e75edb
|
merge
|
2024-07-01 16:00:39 +08:00 |
|
lwl0608
|
e19471c4bd
|
fix
|
2024-07-01 15:59:42 +08:00 |
|
Leufolium
|
e919a70b1d
|
by Robin at 20240628
|
2024-06-28 18:02:13 +08:00 |
|
Leufolium
|
361c7b33b8
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin
|
2024-06-28 14:35:10 +08:00 |
|
Leufolium
|
7bf51c7a87
|
Merge branch 'feat-IRONFANS-120-Robin' into conflict
|
2024-06-26 17:39:27 +08:00 |
|
Leufolium
|
1124d413fa
|
by Robin at 20240626
|
2024-06-26 17:37:00 +08:00 |
|
Leufolium
|
fd19b615b7
|
Merge branch 'feat-IRONFANS-148-Robin' into conflict
|
2024-06-25 18:31:54 +08:00 |
|
Leufolium
|
294f637de0
|
by Robin at 20240625
|
2024-06-25 18:23:18 +08:00 |
|
Leufolium
|
a59a4ca43f
|
by Robin at 20240625
|
2024-06-25 17:48:24 +08:00 |
|
Leufolium
|
813636ca8f
|
by Robin at 20240624
|
2024-06-24 19:14:31 +08:00 |
|
Leufolium
|
210555f7d5
|
Merge branch 'feat-IRONFANS-141-Robin' into conf
|
2024-06-21 20:33:44 +08:00 |
|
Leufolium
|
41cf08be7c
|
by Robin at 20240621
|
2024-06-21 19:51:55 +08:00 |
|
chenhao
|
f7e6647b64
|
Merge pull request 'by Robin at 20240621' (#544) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/544
|
2024-06-21 18:26:21 +08:00 |
|
Leufolium
|
9ee568f858
|
by Robin at 20240621
|
2024-06-21 18:25:24 +08:00 |
|
chenhao
|
606c7030a9
|
Merge pull request 'by Robin at 20240619' (#542) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/542
|
2024-06-19 13:59:36 +08:00 |
|
Leufolium
|
e6d1b90338
|
by Robin at 20240619
|
2024-06-19 13:58:47 +08:00 |
|
Leufolium
|
4f2d33e674
|
Merge branch 'feat-IRONFANS-148-Robin' into cfl
|
2024-06-18 19:46:31 +08:00 |
|
Leufolium
|
6159759111
|
by Robin at 20240617
|
2024-06-17 22:25:43 +08:00 |
|
lwl0608
|
7d27928218
|
fix
|
2024-06-15 14:29:35 +08:00 |
|
lwl0608
|
2cf1c99ce5
|
fix
|
2024-06-15 14:26:52 +08:00 |
|
Leufolium
|
400cda2cc3
|
by Robin at 20240615
|
2024-06-15 13:41:03 +08:00 |
|
lwl0608
|
591238f896
|
merge
|
2024-06-15 13:24:23 +08:00 |
|
lwl0608
|
f314affd2b
|
Merge branch 'dev-lwl/iap' into test
|
2024-06-14 10:26:10 +08:00 |
|
lwl0608
|
67f144144f
|
fix
|
2024-06-14 10:26:00 +08:00 |
|
lwl0608
|
02ac6301a5
|
fx
|
2024-06-13 19:23:01 +08:00 |
|
lwl0608
|
a13966ede9
|
fx
|
2024-06-13 19:22:49 +08:00 |
|
lwl0608
|
fa5cb99a17
|
fx
|
2024-06-13 19:22:03 +08:00 |
|
lwl0608
|
d28f58a733
|
f
|
2024-06-13 16:43:31 +08:00 |
|
lwl0608
|
571a961151
|
apple
|
2024-06-13 16:40:22 +08:00 |
|
chenhao
|
a614e015a4
|
Merge pull request 'feat-IRONFANS-147-Robin' (#529) from feat-IRONFANS-147-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/529
|
2024-06-13 12:32:16 +08:00 |
|
Leufolium
|
b45bddf849
|
by Robin at 20240613
|
2024-06-13 12:29:14 +08:00 |
|
lwl0608
|
056fbabd14
|
proto
|
2024-06-12 23:45:03 +08:00 |
|
chenhao
|
624a521ad1
|
Merge pull request 'by Robin at 20240607; refund rate' (#526) from feat-IRONFANS-144-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/526
|
2024-06-07 16:45:39 +08:00 |
|
Leufolium
|
4a57f04cf4
|
by Robin at 20240607; refund rate
|
2024-06-07 16:45:01 +08:00 |
|
lwl0608
|
39ddeb698b
|
merge
|
2024-06-04 17:46:47 +08:00 |
|
lwl0608
|
8bf8e9357f
|
create order. add paytype: coin
|
2024-06-04 17:44:06 +08:00 |
|
chenhao
|
9358a749c7
|
Merge pull request 'feat-IRONFANS-58-Robin' (#524) from feat-IRONFANS-58-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/524
|
2024-06-04 17:17:15 +08:00 |
|
Leufolium
|
10636fa6a4
|
by Robin at 20240604
|
2024-06-04 12:16:17 +08:00 |
|
lwl0608
|
7af540c2a7
|
Merge branch 'main' into dev-lwl/consul
|
2024-06-03 10:08:45 +08:00 |
|
Leufolium
|
d9d60f69a6
|
by Robin at 20240529
|
2024-05-29 10:48:29 +08:00 |
|
chenhao
|
2ff7822af8
|
Merge pull request 'feat-IRONFANS-133-Robin' (#510) from feat-IRONFANS-133-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/510
|
2024-05-27 16:28:00 +08:00 |
|
Leufolium
|
58229ca3d1
|
by Robin at 20240522; separtaion of offline and online services
|
2024-05-22 17:14:20 +08:00 |
|
chenhao
|
36338ff2e8
|
by Robin at 20240521
|
2024-05-21 23:11:45 +08:00 |
|
chenhao
|
3ff0b4ed87
|
by Robin at 20240516
|
2024-05-21 23:06:48 +08:00 |