wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,089 Commits 107 Branches 0 Tags 48 MiB
Commit Graph

340 Commits

Author SHA1 Message Date
Leufolium 8af9117ba1 1 2024-09-25 13:25:09 +08:00
Leufolium 1940ea3524 Merge branch 'feat-IRONFANS-218-Robin' into confsms 2024-09-25 13:25:04 +08:00
Leufolium d1b38d53c2 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-218-Robin 2024-09-25 13:18:50 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +08:00
lwl0608 3a982826ed tx cdn 2024-09-25 00:45:26 +08:00
lwl0608 b555fb50fb fix cdn tx 2024-09-24 14:07:36 +08:00
lwl0608 c935cc2400 Merge branch 'dev_lwl' into test 2024-09-12 15:46:32 +08:00
lwl0608 ae710ffbc9 fix alipay rate 2024-09-12 15:46:22 +08:00
chenhao 56fe389cd4 Merge pull request 'feat-IRONFANS-205-Robin' (#729) from feat-IRONFANS-205-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/729
 2024-09-11 11:29:30 +08:00
chenhao 7fa78ee5d9 Merge pull request 'feat-IRONFANS-210-Robin' (#728) from feat-IRONFANS-210-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/728
 2024-09-11 11:29:13 +08:00
Leufolium 46130b15fc by Robin at 20240911; 2024-09-11 11:27:39 +08:00
Leufolium 63cf9f1b21 by Robin at 20240911; separate 2024-09-11 11:26:43 +08:00
lwl0608 e06fe1ba36 Merge branch 'dev_fix_fill' into test 2024-09-10 18:50:14 +08:00
lwl0608 53d01fb04d fix xreponse 2024-09-10 18:50:09 +08:00
lwl0608 f94dec8f98 Merge branch 'dev_fix_fill' into test 2024-09-10 18:44:00 +08:00
lwl0608 2421f038e6 fix fill media 2024-09-10 18:43:55 +08:00
lwl0608 abf5a78356 fix recover 2024-09-10 12:50:37 +08:00
Leufolium 715428a777 Merge branch 'feat-IRONFANS-212-Robin' into tconflict 2024-09-02 13:03:26 +08:00
Leufolium 61a54119b9 by Robin at 20240830 2024-08-30 16:34:00 +08:00
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