 chenhao
|
db5788bb51
|
Merge pull request '1' (#709) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/709
|
2024-08-23 17:08:13 +08:00 |
|
Leufolium
|
00eca63c57
|
1
|
2024-08-23 17:07:56 +08:00 |
|
chenhao
|
ab0362bcd4
|
Merge pull request 'by Robin at 20240823' (#708) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/708
|
2024-08-23 17:05:01 +08:00 |
|
Leufolium
|
54bbcf331e
|
by Robin at 20240823
|
2024-08-23 17:04:31 +08:00 |
|
chenhao
|
30d1f7d97f
|
Merge pull request 'by Robin at 20240823' (#707) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/707
|
2024-08-23 16:54:01 +08:00 |
|
Leufolium
|
95e83bafe2
|
by Robin at 20240823
|
2024-08-23 16:53:36 +08:00 |
|
chenhao
|
bd5b4798f6
|
Merge pull request 'by Robin at 20240823' (#706) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/706
|
2024-08-23 16:39:38 +08:00 |
|
Leufolium
|
1e961c9866
|
by Robin at 20240823
|
2024-08-23 16:39:19 +08:00 |
|
Leufolium
|
288fa990c5
|
Merge branch 'feat-IRONFANS-210-Robin' into conflict
|
2024-08-23 16:20:39 +08:00 |
|
Leufolium
|
8bb1042d17
|
by Robin at 20240823
|
2024-08-23 16:17:32 +08:00 |
|
chenhao
|
a711d91368
|
Merge pull request 'by Robin at 20240822' (#703) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/703
|
2024-08-22 18:12:44 +08:00 |
|
Leufolium
|
964de65ecf
|
by Robin at 20240822
|
2024-08-22 18:12:24 +08:00 |
|
Leufolium
|
a771a1e89a
|
Merge branch 'feat-IRONFANS-198-Robin' into test
|
2024-08-16 07:10:54 +08:00 |
|
Leufolium
|
4e0afaa067
|
by Robin at 20240815
|
2024-08-15 07:07:39 +08:00 |
 lwl0608
|
46f32414a8
|
fix tocken
|
2024-08-14 11:13:29 +08:00 |
|
lwl0608
|
0150aefdcc
|
Merge branch 'dev_add_shuilai' into test
|
2024-08-09 15:08:20 +08:00 |
|
lwl0608
|
8fa1d27868
|
shuilai tf
|
2024-08-09 15:07:58 +08:00 |
|
Leufolium
|
b34f197f6d
|
Merge branch 'feat-IRONFANS-186-Robin' into test
|
2024-08-07 22:24:22 +08:00 |
|
Leufolium
|
d33f3f212a
|
by Robin at 20240807
|
2024-08-07 22:22:32 +08:00 |
|
chenhao
|
99161f2de3
|
Merge pull request 'feat-IRONFANS-187-Robin' (#686) from feat-IRONFANS-187-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/686
|
2024-08-07 14:22:58 +08:00 |
|
Leufolium
|
cdb6e784fc
|
by Robin at 20240807
|
2024-08-07 14:22:08 +08:00 |
|
lwl0608
|
03410ec251
|
Merge branch 'dev_remove_return_url' into test
|
2024-08-07 14:08:34 +08:00 |
|
lwl0608
|
68632997c9
|
change alipay rate
|
2024-08-06 20:54:38 +08:00 |
|
Leufolium
|
c6fb23bfa7
|
1
|
2024-08-01 21:31:22 +08:00 |
|
lwl0608
|
f8a4c0fbe7
|
Merge branch 'add_raven'
|
2024-08-01 10:35:00 +08:00 |
|
Leufolium
|
2793aff71d
|
Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict
|
2024-07-31 22:14:57 +08:00 |
|
lwl0608
|
170bf7af92
|
Merge branch 'add_raven' into test
|
2024-07-31 16:43:10 +08:00 |
|
lwl0608
|
6fd0d75f5c
|
add lanxing 02
|
2024-07-31 16:43:03 +08:00 |
|
lwl0608
|
2df4baa5dc
|
Merge branch 'add_refund_log' into test
|
2024-07-31 14:34:05 +08:00 |
|
lwl0608
|
81ee19a92f
|
add log
|
2024-07-31 14:33:59 +08:00 |
|
lwl0608
|
87754b151b
|
Merge branch 'add_refund_log' into test
|
2024-07-31 14:32:36 +08:00 |
|
lwl0608
|
aa0794287a
|
fix
|
2024-07-31 14:32:25 +08:00 |
|
chenhao
|
2cc632574b
|
Merge pull request 'by Robin at 20240730' (#658) from feat-IRONFANS-181-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/658
|
2024-07-30 15:40:27 +08:00 |
|
Leufolium
|
ef320f6b20
|
by Robin at 20240730
|
2024-07-30 15:36:58 +08:00 |
|
chenhao
|
c137fd38bc
|
Merge pull request 'feat-IRONFANS-173-Robin' (#650) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/650
|
2024-07-25 20:28:48 +08:00 |
|
Leufolium
|
2ea3ebb6aa
|
by Robin at 20240725
|
2024-07-25 19:59:35 +08:00 |
|
lwl0608
|
53d7181cae
|
change cdn
|
2024-07-24 19:16:03 +08:00 |
|
Leufolium
|
9467b15d29
|
Merge branch 'feat-IRONFANS-163-Robin' into mainconf
|
2024-07-23 17:38:33 +08:00 |
|
Leufolium
|
a491dff03a
|
Merge branch 'feat-IRONFANS-163-Robin' into conf
|
2024-07-23 16:41:47 +08:00 |
|
Leufolium
|
24b52988f2
|
by Robin at 20240723
|
2024-07-23 16:37:16 +08:00 |
|
Leufolium
|
f83058dc25
|
Merge branch 'feat-IRONFANS-148-Robin' into mainconf
|
2024-07-22 19:11:15 +08:00 |
|
chenhao
|
b72f2b19f8
|
Merge pull request '1' (#634) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/634
|
2024-07-20 10:22:21 +08:00 |
|
Leufolium
|
4df038ad9e
|
1
|
2024-07-20 10:21:45 +08:00 |
|
Leufolium
|
8ce679e746
|
1
|
2024-07-19 22:54:22 +08:00 |
|
chenhao
|
f26bf91807
|
Merge pull request '1' (#633) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/633
|
2024-07-19 19:13:40 +08:00 |
|
Leufolium
|
3b8ed9a4e1
|
1
|
2024-07-19 19:13:02 +08:00 |
|
chenhao
|
2738a1393b
|
Merge pull request 'feat-IRONFANS-163-Robin' (#632) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/632
|
2024-07-19 18:12:01 +08:00 |
|
Leufolium
|
8ac99776b2
|
by Robin at 20240719
|
2024-07-19 18:11:32 +08:00 |
|
lwl0608
|
92a44fb645
|
fix token
|
2024-07-19 15:16:45 +08:00 |
|
chenhao
|
1dd0fdcf08
|
Merge pull request '1:20 lanxing:miyuan' (#630) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/630
|
2024-07-18 22:28:10 +08:00 |