Commit Graph

388 Commits

Author SHA1 Message Date
Leufolium 1abe2c1cfb by Robin at 20241101 2024-11-01 16:09:59 +08:00
Leufolium b1e1ef2db9 Merge branch 'feat-IRONFANS-231-Robin' into main-IRONFANS-231 2024-10-22 16:01:05 +08:00
Leufolium 493ab2ac56 1 2024-10-22 15:53:16 +08:00
Leufolium 461a741c2c by Robin at 20241022 2024-10-22 15:36:18 +08:00
Leufolium 9ca3ba48dc Merge remote-tracking branch 'origin/feat-IRONFANS-231-Robin' into release-20241017 2024-10-17 20:25:25 +08:00
Leufolium 50df41672d Merge branch 'feat-IRONFANS-210-Robin' into release-20241017 2024-10-17 20:24:15 +08:00
Leufolium ee3a73d695 by Robin at 20241017 2024-10-17 11:22:49 +08:00
Leufolium 055bbcdf82 1 2024-10-16 17:43:52 +08:00
Leufolium d9902a3f60 1 2024-10-16 17:30:15 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +08:00
Leufolium d1921bdab5 by Robin at 20241011 2024-10-11 15:24:06 +08:00
Leufolium e6794cf887 by Robin at 20241004; fix 2024-10-04 17:10:14 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +08:00
lwl0608 dc5da5a647 add update pf 2024-09-14 16:25:14 +08:00
lwl0608 afa4ef12db total 2024-09-04 19:05:49 +08:00
lwl0608 eedc49b4b2 main 2024-09-04 15:23:51 +08:00
chenhao d7d7501919 Merge pull request 'feat-IRONFANS-198-Robin' (#718) from feat-IRONFANS-198-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/718
2024-09-02 18:37:03 +08:00
Leufolium eb4f10506e add api 2024-08-29 14:28:52 +08:00
lwl0608 d5f00f015d rollback z refund 2024-08-27 16:57:50 +08:00
Leufolium 8bb1042d17 by Robin at 20240823 2024-08-23 16:17:32 +08:00
lwl0608 b78a44d341 add apis 2024-08-21 10:40:36 +08:00
Leufolium 7a3754550f by Robin at 20240820; no zone price 2024-08-20 18:47:56 +08:00
Leufolium 58e5c6ab1d by Robin at 20240820 2024-08-20 17:35:50 +08:00
Leufolium 5abd6883d4 by Robin at 20240816 2024-08-16 07:06:12 +08:00
Leufolium d4cff8cc01 by Robin at 20240816 2024-08-16 06:14:55 +08:00
Leufolium 4e0afaa067 by Robin at 20240815 2024-08-15 07:07:39 +08:00
lwl0608 b6338fb391 search 2024-08-14 11:01:03 +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 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
lwl0608 3c1841d8d9 order from 2024-08-07 14:08:24 +08:00
Leufolium 98f605c265 Merge branch 'feat-IRONFANS-176-Robin' into mainconf 2024-08-01 22:34:08 +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
Leufolium 2793aff71d Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict 2024-07-31 22:14:57 +08:00
Leufolium 73ada4aa6e by Robin at 20240731 2024-07-31 17:04:08 +08:00
Leufolium dbda736b5d by Robin at 20240731 2024-07-31 15:55:59 +08:00
Leufolium 7af7d2d6f1 by Robin at 20240730 2024-07-30 18:40:15 +08:00
Leufolium d9ef34138b 1 2024-07-30 15:35:27 +08:00
Leufolium 2e08c98384 1 2024-07-30 12:08:21 +08:00
lwl0608 739cc1dd11 fix outer raven 2024-07-29 19:29:34 +08:00
Leufolium 8fcef422bb by Robin at 20240729 2024-07-29 15:48:39 +08:00
Leufolium ae595246be by Robin at 20240726 2024-07-26 12:58:48 +08:00
Leufolium 8eec2ba0ee by Robin at 20240725 2024-07-25 21:35:25 +08:00
Leufolium 2ea3ebb6aa by Robin at 20240725 2024-07-25 19:59:35 +08:00
Leufolium d74af2c693 By Robin at 20240724 2024-07-24 14:14:26 +08:00
chenhao 3cdc52c75e Merge pull request '修复json问题' (#647) from feat-IRONFANS-163-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/647
2024-07-23 22:21:13 +08:00
Leufolium 149901c2c9 修复json问题 2024-07-23 22:08:23 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +08:00