Commit Graph

1225 Commits

Author SHA1 Message Date
lwl0608 58abe323eb stdout 2024-08-14 11:05:15 +08:00
lwl0608 b6338fb391 search 2024-08-14 11:01:03 +08:00
lwl0608 dd7b04a6df Merge branch 'dev_add_shuilai' 2024-08-12 14:17:18 +08:00
chenhao 1a83345fa5 Merge pull request 'mainconflict' (#696) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/696
2024-08-09 18:18:29 +08:00
Leufolium 840867eb71 Merge branch 'feat-IRONFANS-185-Robin' into mainconflict 2024-08-09 18:18:11 +08:00
lwl0608 8fa1d27868 shuilai tf 2024-08-09 15:07:58 +08:00
chenhao ac4bebbf2a Merge pull request 'feat-IRONFANS-191-Robin' (#694) from feat-IRONFANS-191-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/694
2024-08-08 18:01:50 +08:00
Leufolium 946c29b8c8 by Robin at 20240808 2024-08-08 18:00:22 +08:00
Leufolium 75d7645bfb by Robin at 20240808 2024-08-08 17:29:32 +08:00
chenhao bf97d26268 Merge pull request 'by Robin at 20240807' (#691) from feat-IRONFANS-186-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/691
2024-08-08 16:08:22 +08:00
Leufolium 50d3ab3040 by Robin at 20240808 2024-08-08 16:04:50 +08:00
Leufolium d33f3f212a by Robin at 20240807 2024-08-07 22:22:32 +08:00
chenhao 68be863a92 Merge pull request 'by Robin at 20240807' (#688) from feat-IRONFANS-193-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/688
2024-08-07 16:08:55 +08:00
Leufolium 145691fd65 by Robin at 20240807 2024-08-07 16:08:32 +08:00
lwl0608 3c1841d8d9 order from 2024-08-07 14:08:24 +08:00
lwl0608 68632997c9 change alipay rate 2024-08-06 20:54:38 +08:00
chenhao f0fe54bc0e Merge pull request 'feat-IRONFANS-192-Robin' (#685) from feat-IRONFANS-192-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/685
2024-08-06 18:38:43 +08:00
Leufolium c46ef27288 1 2024-08-06 18:06:05 +08:00
Leufolium 99e9c625cd 1 2024-08-06 18:03:59 +08:00
chenhao cb207efa72 Merge pull request '1' (#682) from BUG-20240806 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/682
2024-08-06 14:15:38 +08:00
Leufolium f73d0f9a75 by Robin at 20240806 2024-08-06 14:12:48 +08:00
Leufolium e545065893 1 2024-08-06 13:32:08 +08:00
lwl0608 a2c9915525 withdarw sub msg 2024-08-06 11:40:02 +08:00
lwl0608 cce6f9976c add toast 2024-08-06 11:31:35 +08:00
lwl0608 5afe4d6c4e add use src vd id list 2024-08-03 18:09:09 +08:00
chenhao 499805e4dd Merge pull request '1' (#679) from feat-IRONFANS-176-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/679
2024-08-01 22:40:20 +08:00
Leufolium 8de634b00b 1 2024-08-01 22:40:07 +08:00
chenhao 47d266a635 Merge pull request 'mainconf' (#678) from mainconf into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/678
2024-08-01 22:34:28 +08:00
Leufolium 98f605c265 Merge branch 'feat-IRONFANS-176-Robin' into mainconf 2024-08-01 22:34:08 +08:00
Leufolium 191123ca64 1 2024-08-01 20:38:22 +08:00
Leufolium 71df61c5ff by Robin at 20240801 2024-08-01 20:22:48 +08:00
Leufolium 0b2c83e215 by Robin at 20240801 2024-08-01 16:52:27 +08:00
Leufolium 7ec3af4584 by Robin at 20240801 2024-08-01 16:21:48 +08:00
lwl0608 739b1c6a6d chagne ch 2024-08-01 16:08:23 +08:00
lwl0608 855f39cfa8 fix 2024-08-01 15:57:40 +08:00
lwl0608 bd240d08f3 fix 2024-08-01 14:58:37 +08:00
lwl0608 d4f116de18 x 2024-08-01 14:38:55 +08:00
lwl0608 5f30544f99 fix ch 2024-08-01 14:38:55 +08:00
lwl0608 2103e5a723 ignore pay refund 2024-08-01 14:04:27 +08:00
lwl0608 f8a4c0fbe7 Merge branch 'add_raven' 2024-08-01 10:35:00 +08:00
chenhao 3bb8ce050f Merge pull request 'mainconflict' (#672) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/672
2024-07-31 22:15:33 +08:00
Leufolium 2793aff71d Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict 2024-07-31 22:14:57 +08:00
Leufolium b4e6c2532b 1 2024-07-31 21:59:39 +08:00
Leufolium 73ada4aa6e by Robin at 20240731 2024-07-31 17:04:08 +08:00
Leufolium bbb3f06e3a 1 2024-07-31 16:50:37 +08:00
lwl0608 6fd0d75f5c add lanxing 02 2024-07-31 16:43:03 +08:00
Leufolium 70febfc421 by Robin at 20240731 2024-07-31 16:08:51 +08:00
Leufolium dbda736b5d by Robin at 20240731 2024-07-31 15:55:59 +08:00
lwl0608 96325994ea fix code 2024-07-31 14:55:16 +08:00
lwl0608 81ee19a92f add log 2024-07-31 14:33:59 +08:00