Commit Graph

307 Commits

Author SHA1 Message Date
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
lwl0608 d5af0d750d 1:20 lanxing:miyuan 2024-07-18 22:12:43 +08:00
lwl0608 3bfb560663 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 21:51:28 +08:00
lwl0608 c2973b553f add tiefanzone h5pay 2024-07-17 21:51:24 +08:00
lwl0608 6372e444a8 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 18:06:46 +08:00
lwl0608 2ecaa31ad2 add tiefanzone wxpay 2024-07-17 18:06:39 +08:00
lwl0608 abf1a9ff56 Merge branch 'dev-lwl/video' into test 2024-07-13 13:12:40 +08:00
lwl0608 7c36b8c16f fix 2024-07-13 13:12:34 +08:00
lwl0608 07dd2bcff2 fix 1/50 2024-07-12 09:51:23 +08:00
lwl0608 2b2409f009 lanxing 千分之无 2024-07-11 15:14:27 +08:00
lwl0608 7c510f0e3f Merge branch 'dev-lwl/add_alipay_clients' 2024-07-11 15:13:12 +08:00
lwl0608 24ff2b0a75 fix 2024-07-11 10:04:10 +08:00
lwl0608 e3adc95d15 add random pay 2024-07-11 10:03:25 +08:00
chenhao 81dda7dd72 Merge pull request '1' (#604) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/604
2024-07-09 21:54:27 +08:00
Leufolium 883db65ea4 1 2024-07-09 21:54:04 +08:00