 chenhao
|
6524a34a85
|
Merge pull request 'feat-IRONFANS-70' (#276) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/276
|
2024-04-11 21:52:48 +08:00 |
|
Leufolium
|
b4e04b8841
|
by Robin at 20240411
|
2024-04-11 21:51:46 +08:00 |
|
Leufolium
|
e985e15ae1
|
Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf
|
2024-04-08 20:14:44 +08:00 |
|
Leufolium
|
8927d22bba
|
by Robin at 20240408
|
2024-04-08 20:05:13 +08:00 |
|
Leufolium
|
5a333382ff
|
Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf
|
2024-04-05 17:11:18 +08:00 |
|
Leufolium
|
4820bd9503
|
by Robin at 20240404
|
2024-04-04 20:48:42 +08:00 |
|
Leufolium
|
be27160261
|
Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict
|
2024-04-03 16:55:08 +08:00 |
|
Leufolium
|
50f7e16608
|
by Robin at 20240403
|
2024-04-03 04:56:21 +08:00 |
|
Leufolium
|
a31e57c806
|
by Robin at 20240402
|
2024-04-02 18:53:26 +08:00 |
|
Leufolium
|
a69bcdb6a2
|
Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin
|
2024-04-01 11:19:10 +08:00 |
|
Leufolium
|
113cf31495
|
Merge remote-tracking branch 'origin/main' into test
|
2024-03-28 12:12:05 +08:00 |
|
Leufolium
|
d96a03b02c
|
by Robin at 20240326; fix high concurrency problem
|
2024-03-26 18:26:47 +08:00 |
|
Leufolium
|
7b2d360274
|
by Robin at 20240325; nil
|
2024-03-25 19:37:01 +08:00 |
|
Leufolium
|
1ab2b556a1
|
Merge branch 'BUG-20240322-0001-Robin' into mainconflict
|
2024-03-25 12:13:49 +08:00 |
|
Leufolium
|
294bea59e4
|
By Robin at 20240325; fix bug
|
2024-03-25 12:11:29 +08:00 |
 lwl0608
|
7bb527c1dc
|
fix panic
|
2024-03-25 11:25:37 +08:00 |
|
Leufolium
|
5344a54888
|
Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict
|
2024-03-22 13:54:11 +08:00 |
|
Leufolium
|
407292fe8d
|
by Robin at 20240321
|
2024-03-21 23:26:23 +08:00 |
|
lwl0608
|
53086cde6c
|
fix recover
|
2024-03-21 20:27:42 +08:00 |
|
lwl0608
|
f5cc4e4891
|
fix recovery
|
2024-03-21 20:22:10 +08:00 |
|
lwl0608
|
ad95c1be67
|
recover
|
2024-03-21 20:18:22 +08:00 |
|
lwl0608
|
1255e0f916
|
fix 退款理由
|
2024-03-21 19:54:20 +08:00 |
|
Leufolium
|
37c3929e9d
|
Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict
|
2024-03-19 00:01:43 +08:00 |
|
Leufolium
|
67e27e04db
|
Merge branch 'BUG-20240316-0001-Robin' into conflict
|
2024-03-16 22:36:05 +08:00 |
|
Leufolium
|
1954e80ab3
|
Merge branch 'feat-IRONFANS-58-Robin' into conflict
|
2024-03-14 07:55:43 +08:00 |
|
Leufolium
|
a2f70a63d9
|
by Robin at 20240314; add newly-created moment
|
2024-03-14 07:53:25 +08:00 |
|
lwl0608
|
371cf04c5f
|
ch log
|
2024-03-13 20:51:29 +08:00 |
|
lwl0608
|
779e47996e
|
Merge branch 'dev-lwl/refund'
|
2024-03-13 20:35:32 +08:00 |
|
lwl0608
|
b833ecdc9e
|
refund
|
2024-03-13 20:35:18 +08:00 |
|
lwl0608
|
f781786e13
|
fix cdn
|
2024-03-12 21:21:46 +08:00 |
|
Leufolium
|
f990dd0be0
|
Merge branch 'feat-IRONFANS-66-Robin' into conflict
|
2024-03-12 12:10:16 +08:00 |
|
lwl0608
|
19f60097ff
|
cdn test
|
2024-03-08 15:49:57 +08:00 |
|
lwl0608
|
93048a1a4b
|
cdn test
|
2024-03-08 15:49:32 +08:00 |
|
Leufolium
|
51d3e5e568
|
By Robin at 20240307
|
2024-03-07 01:18:41 +08:00 |
|
Leufolium
|
b2b29d7466
|
by Robin at 20240302
|
2024-03-02 08:29:20 +08:00 |
|
Leufolium
|
b2c8a76e37
|
by Robin at 20240229; add robot
|
2024-02-29 09:55:56 +08:00 |
|
chenhao
|
a1f3e5b4ff
|
Merge pull request 'by Robin at 20240229; fix' (#149) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/149
|
2024-02-29 01:50:14 +08:00 |
|
Leufolium
|
42f56872b9
|
by Robin at 20240229; fix
|
2024-02-29 01:48:51 +08:00 |
|
chenhao
|
c2a010ff26
|
Merge pull request 'by Robin at 20240227;' (#141) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/141
|
2024-02-27 02:21:40 +08:00 |
|
Leufolium
|
9e935ee8df
|
by Robin at 20240227;
|
2024-02-27 02:21:24 +08:00 |
|
chenhao
|
baead8176e
|
Merge pull request 'by Robin at 20240227;fix' (#138) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/138
|
2024-02-27 01:05:56 +08:00 |
|
Leufolium
|
c3db97077b
|
by Robin at 20240227;fix
|
2024-02-27 01:05:14 +08:00 |
|
chenhao
|
4903267633
|
Merge pull request 'feat-20240117-001-Robin' (#137) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/137
|
2024-02-27 00:55:59 +08:00 |
|
lwl0608
|
48d058610d
|
add wxpayh5
|
2024-02-26 19:28:03 +08:00 |
|
lwl0608
|
9b9b84c89f
|
alipay change myts
|
2024-02-24 23:20:27 +08:00 |
|
Leufolium
|
86be2a9a84
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-22 22:31:20 +08:00 |
|
Leufolium
|
cd07846804
|
by Robin at 20240222; fix
|
2024-02-22 21:50:34 +08:00 |
|
Leufolium
|
19de07fbe4
|
by Robin at 20240221; change moment audit logic
|
2024-02-21 18:04:01 +08:00 |
|
lwl0608
|
59f206a612
|
recover apply
|
2024-02-21 11:36:21 +08:00 |
|
lwl0608
|
201e1f4c5c
|
wx jsapi
|
2024-02-20 23:05:24 +08:00 |