Leufolium
|
7e71e670c0
|
Merge branch 'feat-IRONFANS-70' into conflict
|
2024-04-30 09:52:51 +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 |
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
|
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 |
Leufolium
|
b53a96d3bf
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin
|
2024-04-27 08:27:34 +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
|
2ac68c47c7
|
by Robin at 20240426
|
2024-04-26 14:54:27 +08:00 |
Leufolium
|
0630bd9a18
|
by Robin at 20240426
|
2024-04-26 10:46:37 +08:00 |
lwl0608
|
60dd9b28c5
|
add wxpay callback manul
|
2024-04-26 01:29:36 +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
|
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
|
a64b404298
|
fix
|
2024-04-25 14:41:36 +08:00 |
lwl0608
|
f3533490f8
|
add
|
2024-04-25 14:07:46 +08:00 |
lwl0608
|
327a38177f
|
fix
|
2024-04-24 22:24:51 +08:00 |
Leufolium
|
1966a42d28
|
by Robin at 20240422
|
2024-04-23 18:30:28 +08:00 |
chenhao
|
71ccf53d70
|
Merge pull request 'by Robin at 20240422' (#316) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/316
|
2024-04-22 18:57:12 +08:00 |
Leufolium
|
50fa5e32b7
|
by Robin at 20240422
|
2024-04-22 18:56:53 +08:00 |
chenhao
|
796e09af2f
|
Merge pull request 'by Robin at 20240422' (#312) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/312
|
2024-04-22 18:20:36 +08:00 |
Leufolium
|
ab8db00368
|
by Robin at 20240422
|
2024-04-22 18:19:37 +08:00 |
chenhao
|
a5837da513
|
Merge pull request 'by Robin at 20240422' (#306) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/306
|
2024-04-22 07:16:39 +08:00 |
Leufolium
|
f0074facd9
|
by Robin at 20240422
|
2024-04-22 07:15:46 +08:00 |
lwl0608
|
b2c89fb357
|
fix
|
2024-04-18 22:59:32 +08:00 |
lwl0608
|
e7ba504413
|
优化
|
2024-04-18 20:27:18 +08:00 |
lwl0608
|
d6217c6f39
|
vas
|
2024-04-18 19:26:52 +08:00 |
chenhao
|
9436053275
|
Merge pull request 'by Robin at 20240418' (#300) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/300
|
2024-04-18 05:59:58 +08:00 |
Leufolium
|
4fc3732b94
|
by Robin at 20240418
|
2024-04-18 05:59:11 +08:00 |
lwl0608
|
03fdc98f3d
|
修复
|
2024-04-16 21:13:26 +08:00 |
lwl0608
|
5dedd4fd27
|
fix db
|
2024-04-16 20:20:53 +08:00 |
Leufolium
|
50ef95271c
|
by Robin at 20240416
|
2024-04-16 19:48:15 +08:00 |
Leufolium
|
5cd1cbf027
|
by Robin at 20240416
|
2024-04-16 19:10:04 +08:00 |
lwl0608
|
9fdbd5bcb2
|
add
|
2024-04-16 10:49:02 +08:00 |
lwl0608
|
5c01857d28
|
add
|
2024-04-16 09:51:39 +08:00 |
Leufolium
|
da6d60020c
|
by Robin at 20240416
|
2024-04-16 07:41:52 +08:00 |
lwl0608
|
eb3d14199e
|
vas
|
2024-04-15 15:17:30 +08:00 |
chenhao
|
4e99c4fe82
|
Merge pull request 'b' (#284) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/284
|
2024-04-12 06:46:07 +08:00 |
Leufolium
|
156cc92de9
|
b
|
2024-04-12 06:45:51 +08:00 |
Leufolium
|
648a860a83
|
Merge branch 'dev-feat-IRONFANS-70-Robin' into conflict-feat-IRONFANS-70
|
2024-04-12 06:43:00 +08:00 |
Leufolium
|
52624ac592
|
by Robin at 20240411
|
2024-04-12 06:40:30 +08:00 |
chenhao
|
c420f41c05
|
Merge pull request 'by Robin at 20240411' (#277) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/277
|
2024-04-11 21:57:03 +08:00 |
Leufolium
|
1ecae673f6
|
by Robin at 20240411
|
2024-04-11 21:56:48 +08:00 |
chenhao
|
127c289735
|
Merge pull request 'by Robin at 20240411' (#267) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/267
|
2024-04-11 19:35:10 +08:00 |
Leufolium
|
c89082aea9
|
by Robin at 20240411
|
2024-04-11 19:34:51 +08:00 |