chenhao
|
e7ade6e7cf
|
Merge pull request 'by Robin at 20240501' (#399) from feat-IRONFANS-104-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/399
|
2024-05-01 04:32:30 +08:00 |
Leufolium
|
7317ea2a65
|
by Robin at 20240501
|
2024-05-01 04:32:09 +08:00 |
Leufolium
|
d8527b01b1
|
BY
|
2024-05-01 04:09:27 +08:00 |
Leufolium
|
138a8da41d
|
by RObin at
|
2024-05-01 04:01:58 +08:00 |
Leufolium
|
74e6f9a9f5
|
by Robin at 20240501
|
2024-05-01 03:52:59 +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
|
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 |
Leufolium
|
7f18d00df4
|
by Robin at 20240430
|
2024-04-30 09:22:18 +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 |
Leufolium
|
bd0fb55e8e
|
by Robin at 20240429
|
2024-04-29 22:31:27 +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
|
924656e8ed
|
contact
|
2024-04-29 17:52:52 +08:00 |
lwl0608
|
715ff91c51
|
zone_refund_list
|
2024-04-29 17:39:49 +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
|
cc7a910b72
|
fix zone ferund
|
2024-04-29 16:08:51 +08:00 |
lwl0608
|
a8d3a45b71
|
rollback ironfanship
|
2024-04-29 15:56:42 +08:00 |
lwl0608
|
c470a8e77f
|
add zone refund
|
2024-04-29 15:47:45 +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 |
Leufolium
|
442b84a0cd
|
by Robin at 20240428
|
2024-04-28 21:26:59 +08:00 |
lwl0608
|
8db2ce1071
|
fix
|
2024-04-28 17:59:57 +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 |
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
|
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 |
Leufolium
|
2f4a80d3fc
|
by Robin at 20240427
|
2024-04-27 00:47:18 +08:00 |
Leufolium
|
9a5968f158
|
by Robin at 20240427
|
2024-04-27 00:39:28 +08:00 |
Leufolium
|
9fed951998
|
by Robin at 20240427
|
2024-04-27 00:27:53 +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 |
Leufolium
|
05c247314b
|
by Robin at 20240426
|
2024-04-26 19:45:20 +08:00 |
Leufolium
|
2ac68c47c7
|
by Robin at 20240426
|
2024-04-26 14:54:27 +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 |
lwl0608
|
b47afa4909
|
fix
|
2024-04-25 19:19:22 +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
|
6a6781e9d8
|
fix income stype
|
2024-04-25 18:43:38 +08:00 |
chenhao
|
b038ef5896
|
Merge pull request 'by Robin at 20240425' (#341) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/341
|
2024-04-25 18:31:52 +08:00 |
Leufolium
|
4ffcf0a6a6
|
by Robin at 20240425
|
2024-04-25 18:31:34 +08:00 |
chenhao
|
cd7eb88088
|
Merge pull request 'by Robin at 20240425' (#339) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/339
|
2024-04-25 18:27:08 +08:00 |
Leufolium
|
50599bbe49
|
by Robin at 20240425
|
2024-04-25 18:25:52 +08:00 |
chenhao
|
1692ee7360
|
Merge pull request 'by Robin at 20240425' (#337) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/337
|
2024-04-25 18:11:37 +08:00 |
Leufolium
|
a83558e581
|
by Robin at 20240425
|
2024-04-25 18:11:16 +08:00 |
chenhao
|
f7ae3aa297
|
Merge pull request 'by Robin at 20240425' (#335) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/335
|
2024-04-25 17:53:35 +08:00 |
Leufolium
|
7a9f955262
|
by Robin at 20240425
|
2024-04-25 17:53:14 +08:00 |
lwl0608
|
6dca251071
|
fix income stype
|
2024-04-25 17:48:52 +08:00 |
chenhao
|
2890f1e498
|
Merge pull request 'by Robin at 20240425' (#333) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/333
|
2024-04-25 17:21:01 +08:00 |
Leufolium
|
8f574d73fb
|
by Robin at 20240425
|
2024-04-25 17:20:35 +08:00 |
lwl0608
|
88b4c917c6
|
fix calc
|
2024-04-25 16:44:50 +08:00 |
chenhao
|
0d6b0bce10
|
Merge pull request 'by Robin at 20240425' (#331) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/331
|
2024-04-25 16:41:01 +08:00 |
Leufolium
|
197fb8e87e
|
by Robin at 20240425
|
2024-04-25 16:40:21 +08:00 |
lwl0608
|
7e5c721c97
|
fix
|
2024-04-25 15:28:25 +08:00 |
lwl0608
|
8950b008e6
|
add log
|
2024-04-25 15:16:59 +08:00 |
lwl0608
|
01e4bfcd8c
|
fix refund_status
|
2024-04-25 15:12:22 +08:00 |
lwl0608
|
a64b404298
|
fix
|
2024-04-25 14:41:36 +08:00 |
lwl0608
|
4fb56ba1cc
|
add
|
2024-04-25 14:36:53 +08:00 |
lwl0608
|
f3533490f8
|
add
|
2024-04-25 14:07:46 +08:00 |
lwl0608
|
25410368f5
|
order
|
2024-04-25 10:06:28 +08:00 |
chenhao
|
b74f7540b8
|
Merge pull request 'by Robin at 20240425' (#329) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/329
|
2024-04-25 10:02:33 +08:00 |
Leufolium
|
3fef23d3c3
|
by Robin at 20240425
|
2024-04-25 10:01:34 +08:00 |
lwl0608
|
cd840f36e4
|
refund
|
2024-04-24 22:35:00 +08:00 |
lwl0608
|
49c31aa9ce
|
fix
|
2024-04-24 21:42:31 +08:00 |
lwl0608
|
c355c74390
|
fix
|
2024-04-24 21:39:47 +08:00 |
lwl0608
|
4da4ca70d1
|
get zone by mid
|
2024-04-24 21:20:31 +08:00 |
chenhao
|
2a84d99b65
|
Merge pull request 'by Robin at 20240424' (#327) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/327
|
2024-04-24 20:17:18 +08:00 |
Leufolium
|
5d7220246e
|
by Robin at 20240424
|
2024-04-24 20:16:22 +08:00 |
lwl0608
|
f4dd7158e1
|
add incomlist log
|
2024-04-24 19:36:01 +08:00 |
lwl0608
|
6e83930c9e
|
fix
|
2024-04-23 19:08:45 +08:00 |
chenhao
|
d48d695310
|
Merge pull request 'by Robin at 20240422' (#325) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/325
|
2024-04-23 18:32:13 +08:00 |
Leufolium
|
1966a42d28
|
by Robin at 20240422
|
2024-04-23 18:30:28 +08:00 |
lwl0608
|
58c2692eb8
|
fix coin order
|
2024-04-23 17:39:42 +08:00 |
lwl0608
|
2860992cba
|
fix in error
|
2024-04-23 17:32:29 +08:00 |
lwl0608
|
561afa8755
|
fix tx
|
2024-04-23 17:29:27 +08:00 |
lwl0608
|
9cd894a47b
|
fix chaofen song weixin
|
2024-04-23 17:22:47 +08:00 |
lwl0608
|
f901feadf7
|
fix chaofen song weixin
|
2024-04-23 17:12:41 +08:00 |
lwl0608
|
8e52f92b0b
|
add
|
2024-04-23 17:01:59 +08:00 |
lwl0608
|
9600ec1b29
|
fix
|
2024-04-22 22:09:22 +08:00 |
lwl0608
|
ca924bf81a
|
fix
|
2024-04-22 21:20:17 +08:00 |