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 |
Leufolium
|
ddbba1f860
|
by Robin at 20240427
|
2024-04-27 00:18:31 +08:00 |
chenhao
|
7dcc739c86
|
Merge pull request 'by Robin at 20240426' (#356) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/356
|
2024-04-26 23:02:12 +08:00 |
Leufolium
|
7cb60f01b6
|
by Robin at 20240426
|
2024-04-26 23:01:55 +08:00 |
lwl0608
|
97e3d86078
|
fix refund
|
2024-04-26 21:10:52 +08:00 |
chenhao
|
85a19924cc
|
Merge pull request 'by Robin at 20240426' (#355) from feat-IRONFANS-STREAMER-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/355
|
2024-04-26 19:46:03 +08:00 |
Leufolium
|
05c247314b
|
by Robin at 20240426
|
2024-04-26 19:45:20 +08:00 |
chenhao
|
3908f40305
|
Merge pull request 'by Robin at 20240426' (#353) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/353
|
2024-04-26 14:55:18 +08:00 |
chenhao
|
c922628f5a
|
Merge pull request 'main' (#352) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/352
|
2024-04-26 14:55:04 +08:00 |
Leufolium
|
2ac68c47c7
|
by Robin at 20240426
|
2024-04-26 14:54:27 +08:00 |
chenhao
|
629555ad36
|
Merge pull request 'feat-IRONFANS-70' (#351) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/351
|
2024-04-26 11:22:48 +08:00 |
chenhao
|
402b991583
|
Merge pull request 'dev-feat-IRONFANS-70-Robin' (#350) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/350
|
2024-04-26 11:22:33 +08:00 |
Leufolium
|
4137710945
|
by Robin at 20240426
|
2024-04-26 11:13:49 +08:00 |
Leufolium
|
3076813dfb
|
by Robin at 20240426; rollback create times of deleted zone moment
|
2024-04-26 10:48:57 +08:00 |
Leufolium
|
0630bd9a18
|
by Robin at 20240426
|
2024-04-26 10:46:37 +08:00 |
lwl0608
|
30f4a9dd37
|
fix membership change
|
2024-04-26 02:27:07 +08:00 |
lwl0608
|
f80bfb3ab5
|
fix
|
2024-04-26 01:30:40 +08:00 |
lwl0608
|
60dd9b28c5
|
add wxpay callback manul
|
2024-04-26 01:29:36 +08:00 |
lwl0608
|
0f96f44c3e
|
fix
|
2024-04-26 01:13:35 +08:00 |
chenhao
|
4b9a5327d0
|
Merge pull request 'feat-IRONFANS-70' (#349) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/349
|
2024-04-25 20:31:13 +08:00 |
chenhao
|
77be70a4df
|
Merge pull request 'feat-IRONFANS-70' (#348) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/348
|
2024-04-25 20:18:48 +08:00 |
chenhao
|
ccf590ebe2
|
Merge pull request 'by Robin at 20240425' (#347) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/347
|
2024-04-25 20:18:38 +08:00 |
Leufolium
|
eac26caaf7
|
by Robin at 20240425
|
2024-04-25 20:18:23 +08:00 |
chenhao
|
13011cdd8b
|
Merge pull request 'feat-IRONFANS-70' (#346) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/346
|
2024-04-25 20:16:25 +08:00 |
chenhao
|
dbcf924eda
|
Merge pull request 'by Robin at 20240425' (#345) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/345
|
2024-04-25 20:16:15 +08:00 |
Leufolium
|
0429bbdf57
|
by Robin at 20240425
|
2024-04-25 20:15:48 +08:00 |
lwl0608
|
e4d97122a1
|
Merge branch 'feat-IRONFANS-70' into test
|
2024-04-25 19:20:07 +08:00 |
lwl0608
|
b47afa4909
|
fix
|
2024-04-25 19:19:22 +08:00 |
chenhao
|
5bc35d7cb6
|
Merge pull request 'feat-IRONFANS-70' (#344) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/344
|
2024-04-25 18:45:09 +08:00 |
chenhao
|
b75e80c928
|
Merge pull request 'by Robin at 20240425' (#343) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/343
|
2024-04-25 18:44:57 +08:00 |
Leufolium
|
5fd92b9716
|
by Robin at 20240425
|
2024-04-25 18:44:35 +08:00 |
lwl0608
|
063e134f85
|
Merge branch 'feat-IRONFANS-70' into test
|
2024-04-25 18:43:54 +08:00 |
lwl0608
|
6a6781e9d8
|
fix income stype
|
2024-04-25 18:43:38 +08:00 |