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

774 Commits

Author SHA1 Message Date
chenhao d4f38b5d34 Merge pull request 'by Robin at 20241120' (#816) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/816
 2024-11-20 18:38:01 +08:00
Leufolium 76fe6ef75e by Robin at 20241120 2024-11-20 18:36:35 +08:00
chenhao 160c54dfba Merge pull request 'BUG-20241119' (#810) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/810
 2024-11-20 16:46:27 +08:00
Leufolium 067de8dcc4 by Robin at 20241120 2024-11-20 16:45:58 +08:00
Leufolium e014d2b80a Merge branch 'feat-IRONFANS-235-Robin' into test 2024-11-18 17:00:49 +08:00
chenhao 25352fbf06 Merge pull request '1' (#805) from feat-IRONFANS-235-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/805
 2024-11-18 16:57:04 +08:00
Leufolium c72afa8b57 1 2024-11-18 16:56:44 +08:00
chenhao dc82c76c4f Merge pull request 'feat-IRONFANS-235-Robin' (#804) from feat-IRONFANS-235-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/804
 2024-11-18 16:44:46 +08:00
Leufolium f6a60004fe Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 16:21:46 +08:00
Leufolium 5a88ba39ae 1 2024-11-18 16:18:38 +08:00
Leufolium 761499bef5 Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 15:18:49 +08:00
Leufolium 98cf6b3f4b by Robin at 20241118 2024-11-18 15:16:10 +08:00
Leufolium 5cb17dc87b Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-15 15:10:49 +08:00
Leufolium b7d941abe7 1 2024-11-15 15:01:07 +08:00
Leufolium 3a9b4a6827 by Robin at 20241115 2024-11-15 15:00:37 +08:00
Leufolium a74773681e by Robin at 20241114 2024-11-14 16:30:59 +08:00
Leufolium e57a2e4f55 by Robin at 20241113 2024-11-13 15:32:59 +08:00
chenhao 570d26463f Merge pull request '1' (#794) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/794
 2024-11-12 18:05:35 +08:00
Leufolium 49f0c03e70 1 2024-11-12 18:04:44 +08:00
chenhao f74a126912 Merge pull request 'feat-IRONFANS-212-Robin' (#793) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/793
 2024-11-12 17:38:29 +08:00
Leufolium 9277356df2 by Robin at 20241112 2024-11-12 17:37:18 +08:00
Leufolium 4606b327c5 Merge branch 'feat-IRONFANS-238-Robin' into feat-IRONFANS-212-Robin 2024-11-12 16:36:26 +08:00
Leufolium 0870b550b8 by Robin at 20241112 2024-11-12 16:34:26 +08:00
Leufolium b5f5a81915 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-11 15:17:31 +08:00
chenhao fa91563548 Merge pull request 'by Robin at 20241111' (#789) from feat-IRONFANS-238-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/789
 2024-11-11 13:46:32 +08:00
chenhao 76935fed75 Merge pull request '1' (#788) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/788
 2024-11-11 13:46:08 +08:00
Leufolium 14e4a6b09b 1 2024-11-11 13:45:37 +08:00
chenhao 498600ae10 Merge pull request 'feat-IRONFANS-212-Robin' (#786) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/786
 2024-11-11 13:42:23 +08:00
Leufolium 7ab72de288 1 2024-11-11 13:41:58 +08:00
Leufolium 43fd646524 by Robin at 20241111 2024-11-11 13:34:25 +08:00
Leufolium 06cf21e8d6 by Robin at 20241108; curry 2024-11-08 16:30:02 +08:00
chenhao 90583d5110 Merge pull request '1' (#784) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/784
 2024-11-08 11:20:18 +08:00
Leufolium 18f1a9156c 1 2024-11-08 11:20:02 +08:00
Leufolium e1bd39e683 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-07 18:56:23 +08:00
Leufolium 6706183f44 by Robin at 20241107 2024-11-07 17:20:34 +08:00
Leufolium 9b830999aa by Robin at 20241107 2024-11-07 17:05:13 +08:00
Leufolium 521d7694c2 by Robin at 20241107 2024-11-07 12:48:43 +08:00
Leufolium 0d0414b344 by Robin at 20241106 2024-11-06 17:37:46 +08:00
Leufolium 5954bea877 by Robin at 20241106 2024-11-06 13:50:29 +08:00
Leufolium eb611cb964 1 2024-11-05 16:33:40 +08:00
Leufolium 1d5f40b802 1 2024-11-04 18:26:51 +08:00
Leufolium 0277f51c12 Merge remote-tracking branch 'origin/main' into mtest 1 2024-11-01 16:28:07 +08:00
Leufolium 1abe2c1cfb by Robin at 20241101 2024-11-01 16:09:59 +08:00
Leufolium 680cefa724 1 2024-11-01 15:35:45 +08:00
Leufolium 5bad31df47 Merge branch 'feat-IRONFANS-212-Robin' into conf-IRONFANS-212 2024-10-29 14:59:50 +08:00
Leufolium 8fdac4d4f2 by Robin at 20241029 2024-10-29 14:57:22 +08:00
lwl0608 5ab1402ca2 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-24 20:25:39 +08:00
lwl0608 c75543c9e6 add VO price_list 2024-10-24 20:25:30 +08:00
Leufolium b1e1ef2db9 Merge branch 'feat-IRONFANS-231-Robin' into main-IRONFANS-231 2024-10-22 16:01:05 +08:00
chenhao bd8652f824 Merge pull request 'feat-IRONFANS-231-Robin' (#769) from feat-IRONFANS-231-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/769
 2024-10-22 15:53:56 +08:00
Leufolium 493ab2ac56 1 2024-10-22 15:53:16 +08:00
Leufolium cb91af63e3 Merge branch 'feat-IRONFANS-231-Robin' into conflict-IRONFANS-231 2024-10-22 15:38:23 +08:00
Leufolium 461a741c2c by Robin at 20241022 2024-10-22 15:36:18 +08:00
Leufolium 5e96d99441 Merge branch 'feat-IRONFANS-212-Robin' into conflict-IRONFANS-212 2024-10-22 13:30:35 +08:00
Leufolium 02ca375de8 1 2024-10-22 11:53:59 +08:00
Leufolium a5f6c2d931 by Robin at 20241021 2024-10-21 16:07:56 +08:00
Leufolium c3fa461b9a 1 2024-10-21 14:36:01 +08:00
Leufolium b5979089b9 by Robin at 20241018 2024-10-18 16:41:06 +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
chenhao c60194c221 Merge pull request 'conf-IRONFANS-210' (#760) from conf-IRONFANS-210 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/760
 2024-10-17 11:24:56 +08:00
Leufolium 2df2341e6b Merge branch 'feat-IRONFANS-210-Robin' into conf-IRONFANS-210 2024-10-17 11:24:22 +08:00
Leufolium ee3a73d695 by Robin at 20241017 2024-10-17 11:22:49 +08:00
chenhao c537d82329 Merge pull request '1' (#758) from feat-IRONFANS-231-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/758
 2024-10-16 17:44:11 +08:00
Leufolium 055bbcdf82 1 2024-10-16 17:43:52 +08:00
Leufolium 76574c4e18 Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231 2024-10-16 17:32: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 efb929e7ac by Robin at 20241015 2024-10-15 15:11:14 +08:00
Leufolium 357ee2a3be 1 2024-10-14 13:39:19 +08:00
lwl0608 c72f0555a1 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-12 16:34:07 +08:00
lwl0608 a1a414d6da fix 2024-10-12 16:33:58 +08:00
Leufolium 5295ffb251 Merge branch 'feat-IRONFANS-229-Robin' into conflict 2024-10-11 15:26:52 +08:00
Leufolium d1921bdab5 by Robin at 20241011 2024-10-11 15:24:06 +08:00
lwl0608 45bbf40bf3 merge 2024-10-10 09:00:04 +08:00
lwl0608 cbf4cc764c freeze op 2024-10-10 08:59:27 +08:00
lwl0608 2bc8ce98bd init 2024-10-09 21:06:26 +08:00
chenhao 3c9e3303d8 Merge pull request 'BUG-20241004-Robin' (#743) from BUG-20241004-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/743
 2024-10-04 17:10:35 +08:00
Leufolium e6794cf887 by Robin at 20241004; fix 2024-10-04 17:10:14 +08:00
Leufolium 1940ea3524 Merge branch 'feat-IRONFANS-218-Robin' into confsms 2024-09-25 13:25:04 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +08:00
lwl0608 80eabf0a5e Merge branch 'dev_PF' into test 2024-09-14 16:25:32 +08:00
lwl0608 dc5da5a647 add update pf 2024-09-14 16:25:14 +08:00
chenhao f202adbb5f Merge pull request 'by Robin at 20240912;' (#736) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/736
 2024-09-12 16:19:11 +08:00
Leufolium 4038b87864 by Robin at 20240912; 2024-09-12 16:18:48 +08:00
chenhao 6b91c35199 Merge pull request 'feat-IRONFANS-212-Robin' (#734) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/734
 2024-09-12 15:51:32 +08:00
Leufolium cdb1f9a24a by Robin at 20240912 2024-09-12 11:54:16 +08:00
Leufolium b5f0159358 by Robin at 20240911; notificaton 2024-09-11 15:44:49 +08:00
lwl0608 7ae2dc5955 merge 2024-09-04 19:06:53 +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 174d4242e7 Merge branch 'feat-IRONFANS-212-Robin' into tconflict 2024-09-02 13:05:46 +08:00
Leufolium 947b2ed877 1 2024-09-02 13:04:12 +08:00
Leufolium 715428a777 Merge branch 'feat-IRONFANS-212-Robin' into tconflict 2024-09-02 13:03:26 +08:00
Leufolium 19cccc907f by Robin at 20240902 2024-09-02 12:52:49 +08:00
Leufolium 61a54119b9 by Robin at 20240830 2024-08-30 16:34:00 +08:00
chenhao 73130e4a4b Merge pull request 'add api' (#710) from feat-IRONFANS-198-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/710
 2024-08-29 14:29:38 +08:00
Leufolium eb4f10506e add api 2024-08-29 14:28:52 +08:00
lwl0608 b72ea86f5b merge 2024-08-27 17:06:03 +08:00
lwl0608 d5f00f015d rollback z refund 2024-08-27 16:57:50 +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
lwl0608 7485a02f11 Merge branch 'dev_search_zmember' into test 2024-08-21 10:40:43 +08:00
lwl0608 b78a44d341 add apis 2024-08-21 10:40:36 +08:00
chenhao 9bf37ecd11 Merge pull request 'by Robin at 20240820; no zone price' (#700) from feat-IRONFANS-198-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/700
 2024-08-20 18:48:12 +08:00
Leufolium 7a3754550f by Robin at 20240820; no zone price 2024-08-20 18:47:56 +08:00
chenhao 25a5820fdf Merge pull request 'by Robin at 20240820' (#699) from feat-IRONFANS-198-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/699
 2024-08-20 17:39:15 +08:00
Leufolium 58e5c6ab1d by Robin at 20240820 2024-08-20 17:35:50 +08:00
Leufolium a771a1e89a Merge branch 'feat-IRONFANS-198-Robin' into test 2024-08-16 07:10:54 +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 a3a98587f3 merge 2024-08-14 11:02:26 +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
chenhao 566a86f002 Merge pull request 'by Robin at 20240808' (#693) from feat-IRONFANS-191-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/693
 2024-08-08 18:01:37 +08:00
Leufolium 946c29b8c8 by Robin at 20240808 2024-08-08 18:00:22 +08:00
chenhao 1b2d0e1a03 Merge pull request 'by Robin at 20240808' (#690) from feat-IRONFANS-191-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/690
 2024-08-08 16:05:20 +08:00
Leufolium 50d3ab3040 by Robin at 20240808 2024-08-08 16:04:50 +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
lwl0608 03410ec251 Merge branch 'dev_remove_return_url' into test 2024-08-07 14:08:34 +08:00
lwl0608 3c1841d8d9 order from 2024-08-07 14:08:24 +08:00
Leufolium ccc119277c 1 2024-08-06 18:16:56 +08:00
Leufolium 98f605c265 Merge branch 'feat-IRONFANS-176-Robin' into mainconf 2024-08-01 22:34:08 +08:00
lwl0608 b5ae89028b merge 2024-08-01 14:06:39 +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
chenhao 4076be621a Merge pull request 'by Robin at 20240731' (#669) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/669
 2024-07-31 17:10:57 +08:00
Leufolium 73ada4aa6e by Robin at 20240731 2024-07-31 17:04:08 +08:00
chenhao 0566554519 Merge pull request 'by Robin at 20240731' (#665) from feat-IRONFANS-176-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/665
 2024-07-31 15:58:42 +08:00
Leufolium dbda736b5d by Robin at 20240731 2024-07-31 15:55:59 +08:00
Leufolium 44b37b1ad0 Merge branch 'feat-IRONFANS-176-Robin' into conflict 2024-07-30 18:58:16 +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 e1d63b08d6 Merge branch 'add_raven' into test 2024-07-29 19:29:40 +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
chenhao a7f3d8f813 Merge pull request 'by Robin at 20240726' (#655) from feat-IRONFANS-166-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/655
 2024-07-26 12:59:23 +08:00
Leufolium ae595246be by Robin at 20240726 2024-07-26 12:58:48 +08:00
Leufolium 6310092360 Merge remote-tracking branch 'origin/feat-IRONFANS-166-Robin' into conf 2024-07-25 21:37:08 +08:00
Leufolium 8eec2ba0ee by Robin at 20240725 2024-07-25 21:35:25 +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
chenhao ac6ee62ac6 Merge pull request 'By Robin at 20240724' (#649) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/649
 2024-07-24 14:19:56 +08:00
chenhao 2f8ee103f4 Merge pull request 'main' (#648) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/648
 2024-07-24 14:19:43 +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
Leufolium f83058dc25 Merge branch 'feat-IRONFANS-148-Robin' into mainconf 2024-07-22 19:11:15 +08:00
chenhao b87106fa8f Merge pull request '1' (#637) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/637
 2024-07-22 16:12:37 +08:00
Leufolium 6b800705c5 1 2024-07-22 16:12:22 +08:00
Leufolium 4540f29515 Merge branch 'feat-IRONFANS-173-Robin' into conflict 2024-07-22 16:02:15 +08:00
Leufolium de7adf04e8 1 2024-07-22 15:57:56 +08:00
Leufolium 62efdad5c0 1 2024-07-22 13:45:57 +08:00
Leufolium b283c34f44 by Robin at 20240722 2024-07-22 09:17:49 +08:00
Leufolium 2167befc4d 1 2024-07-19 18:31:15 +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 de756dab19 1 2024-07-19 17:46:58 +08:00
lwl0608 53ae309348 merge 2024-07-19 11:03:20 +08:00
lwl0608 9c2ba123a2 rollback_zone_exit_status 2024-07-19 11:02:34 +08:00
Leufolium 98c6ef4f36 1 2024-07-19 08:43:30 +08:00
Leufolium ea7d25b0a9 by Robin at 20240719 2024-07-19 08:32:59 +08:00
Leufolium 0665b22b3f Merge branch 'main' into feat-IRONFANS-163-Robin 2024-07-18 22:27:10 +08:00
chenhao d993545e94 Merge pull request 'by Robin at 20240718' (#627) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/627
 2024-07-18 22:06:12 +08:00
Leufolium 33f7406ece by Robin at 20240718 2024-07-18 22:05:49 +08:00
Leufolium 74183a0331 by Robin at 20240718 2024-07-18 19:29:11 +08:00
lwl0608 f01f9a3ecb 1 2024-07-17 17:51:08 +08:00
Leufolium 36f7b60923 Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-17 13:00:51 +08:00
Leufolium 9663b7121e by Robin at 20240717 2024-07-17 12:01:56 +08:00
chenhao 395d72a4b6 Merge pull request '1' (#616) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/616
 2024-07-15 18:17:13 +08:00
Leufolium 30542411c4 1 2024-07-15 18:12:20 +08:00
Leufolium 89d3db64e3 Merge branch 'feat-IRONFANS-157-Robin' into conf 2024-07-10 05:50:35 +08:00
Leufolium e47ed25ed0 by Robin at 20240710 2024-07-10 05:47:56 +08:00
chenhao 75cf6fb68d Merge pull request 'by Robin at 20240710' (#605) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/605
 2024-07-10 05:18:33 +08:00
Leufolium 739b47f032 by Robin at 20240710 2024-07-10 05:18:02 +08:00
Leufolium 4b3aef5cba Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-07-09 21:04:52 +08:00
Leufolium 8990758254 by Robin at 20240709 2024-07-09 21:02:18 +08:00
chenhao b5e5e891cf Merge pull request '1' (#600) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/600
 2024-07-05 16:59:54 +08:00
Leufolium 518b494873 1 2024-07-05 16:59:39 +08:00
chenhao 8356d54b3e Merge pull request '1' (#599) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/599
 2024-07-05 16:55:24 +08:00
Leufolium cdcf23db57 1 2024-07-05 16:55:10 +08:00
chenhao adad3942a0 Merge pull request 'feat-IRONFANS-148-Robin' (#597) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/597
 2024-07-05 16:48:13 +08:00
Leufolium ffcd559825 by Robin at 20240705 2024-07-05 16:47:36 +08:00
Leufolium c2567cbab4 by Robin at 20240705 2024-07-05 16:26:36 +08:00
Leufolium 876c0ccfbc Merge branch 'feat-IRONFANS-148-Robin' into conf 2024-07-04 10:08:28 +08:00
Leufolium 57d6fb8fdf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-07-04 10:06:48 +08:00
Leufolium 3e2812dd15 by Robin at 20240704 2024-07-04 09:51:42 +08:00
Leufolium ee862c8a2d by Robin at 20240704 2024-07-04 09:26:52 +08:00
Leufolium 8822343f44 by Robin at 20240703 2024-07-03 16:43:58 +08:00
chenhao 3f3dc87867 Merge pull request 'by Robin at 20240702' (#582) from feat-IRONFANS-160-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/582
 2024-07-02 18:40:22 +08:00
Leufolium faa900a4cd by Robin at 20240702 2024-07-02 18:40:00 +08:00
Leufolium 302adfee08 by Robin at 20240702 2024-07-02 08:52:13 +08:00
Leufolium dc184f040e by Robin at 20240702 2024-07-02 08:32:37 +08:00
Leufolium 82a7b94f0e by Robin at 20240702 2024-07-02 05:49:27 +08:00