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

1482 Commits

Author SHA1 Message Date
lwl0608 f2cc03bcd5 Merge branch 'dev_rb_zone_refund' into test 2024-08-27 17:10:26 +08:00
lwl0608 3ac4248f26 merge 2024-08-27 17:10:20 +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
lwl0608 21feca85b8 Merge branch 'dev_search_zmember' into test 2024-08-26 14:44:01 +08:00
lwl0608 dfa425b64d zm 2024-08-26 14:43:57 +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
chenhao 50974050a3 Merge pull request 'by Robin at 20240822' (#702) from feat-IRONFANS-198-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/702
 2024-08-22 12:19:39 +08:00
Leufolium 75413625fd by Robin at 20240822 2024-08-22 12:19:01 +08:00
chenhao c5f8b07beb Merge pull request 'by Robin at 20240821' (#701) from feat-IRONFANS-198-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/701
 2024-08-21 22:20:42 +08:00
Leufolium 18e50bbd86 by Robin at 20240821 2024-08-21 22:19:56 +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
lwl0608 143492deec Merge branch 'dev_anliang' into test 2024-08-20 17:58:52 +08:00
lwl0608 087eaaf786 xxx 2024-08-20 17:58:47 +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
chenhao 1284d85f04 Merge pull request 'by Robin at 20240819' (#698) from feat-IRONFANS-201-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/698
 2024-08-19 13:09:36 +08:00
Leufolium 49905a4c56 by Robin at 20240819 2024-08-19 13:05:29 +08:00
lwl0608 64c6ee4fec Merge branch 'dev_search_zmember' into test 2024-08-16 16:47:25 +08:00
lwl0608 0bc00d03a8 filetest 2024-08-16 16:47:21 +08:00
lwl0608 fc62b86ae5 Merge branch 'dev_search_zmember' into test 2024-08-16 15:59:27 +08:00
lwl0608 7094b703c9 https://file.wishpaldev.tech/ 2024-08-16 15:59:20 +08:00
Leufolium cfbca174b7 1 2024-08-16 07:13:52 +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
lwl0608 dd7b04a6df Merge branch 'dev_add_shuilai' 2024-08-12 14:17:18 +08:00
Leufolium 840867eb71 Merge branch 'feat-IRONFANS-185-Robin' into mainconflict 2024-08-09 18:18:11 +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
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 bc4f8a62f1 Merge pull request 'by Robin at 20240808' (#692) from feat-IRONFANS-191-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/692
 2024-08-08 17:29:47 +08:00
Leufolium 75d7645bfb by Robin at 20240808 2024-08-08 17:29:32 +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
Leufolium 145691fd65 by Robin at 20240807 2024-08-07 16:08:32 +08:00
chenhao 1644283cd0 Merge pull request 'by Robin at 20240807' (#687) from feat-IRONFANS-187-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/687
 2024-08-07 15:40:27 +08:00
Leufolium 33764d3c75 by Robin at 20240807 2024-08-07 15:38:53 +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 3c1841d8d9 order from 2024-08-07 14:08:24 +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 ccc119277c 1 2024-08-06 18:16:56 +08:00
chenhao f93fe3d592 Merge pull request '1' (#684) from feat-IRONFANS-192-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/684
 2024-08-06 18:06:20 +08:00
Leufolium c46ef27288 1 2024-08-06 18:06:05 +08:00
chenhao 45cb1685b1 Merge pull request '1' (#683) from feat-IRONFANS-192-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/683
 2024-08-06 18:04:29 +08:00
Leufolium 99e9c625cd 1 2024-08-06 18:03:59 +08:00
chenhao e0485b9c06 Merge pull request 'by Robin at 20240806' (#681) from feat-IRONFANS-192-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/681
 2024-08-06 14:13:10 +08:00
Leufolium f73d0f9a75 by Robin at 20240806 2024-08-06 14:12:48 +08:00
chenhao c2d3b2cf30 Merge pull request '1' (#680) from BUG-20240806 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/680
 2024-08-06 13:32:41 +08:00
Leufolium e545065893 1 2024-08-06 13:32:08 +08:00
lwl0608 d09d2242b0 Merge branch 'alipay_transfer_tip' into test 2024-08-06 11:40:06 +08:00
lwl0608 a2c9915525 withdarw sub msg 2024-08-06 11:40:02 +08:00
lwl0608 8a6de0408c Merge branch 'alipay_transfer_tip' into test 2024-08-06 11:31:50 +08:00
lwl0608 cce6f9976c add toast 2024-08-06 11:31:35 +08:00
Leufolium 98f605c265 Merge branch 'feat-IRONFANS-176-Robin' into mainconf 2024-08-01 22:34:08 +08:00
chenhao 0bbf0f301f Merge pull request '1' (#676) from feat-IRONFANS-176-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/676
 2024-08-01 20:38:36 +08:00
Leufolium 191123ca64 1 2024-08-01 20:38:22 +08:00
chenhao 81e266e0b1 Merge pull request 'by Robin at 20240801' (#675) from feat-IRONFANS-185-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/675
 2024-08-01 20:23:00 +08:00
Leufolium 71df61c5ff by Robin at 20240801 2024-08-01 20:22:48 +08:00
chenhao 8a376774e0 Merge pull request 'by Robin at 20240801' (#674) from feat-IRONFANS-185-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/674
 2024-08-01 16:52:55 +08:00
Leufolium 0b2c83e215 by Robin at 20240801 2024-08-01 16:52:27 +08:00
chenhao 4876bb6ca8 Merge pull request 'by Robin at 20240801' (#673) from feat-IRONFANS-185-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/673
 2024-08-01 16:22:05 +08:00
Leufolium 7ec3af4584 by Robin at 20240801 2024-08-01 16:21:48 +08:00
lwl0608 e9d57430b0 Merge branch 'add_ch' into test 2024-08-01 16:08:32 +08:00
lwl0608 739b1c6a6d chagne ch 2024-08-01 16:08:23 +08:00
lwl0608 e26f7180ea Merge branch 'add_ch' into test 2024-08-01 15:57:49 +08:00
lwl0608 855f39cfa8 fix 2024-08-01 15:57:40 +08:00
lwl0608 909bcb3b7f Merge branch 'add_ch' into test 2024-08-01 14:58:41 +08:00
lwl0608 bd240d08f3 fix 2024-08-01 14:58:37 +08:00
lwl0608 9bb54ffcb3 merge 2024-08-01 14:39:34 +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 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 0a8005e7da Merge pull request '1' (#670) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/670
 2024-07-31 21:59:54 +08:00
Leufolium b4e6c2532b 1 2024-07-31 21:59:39 +08:00
chenhao 25d67b2846 Merge pull request 'by Robin at 20240731' (#668) from BUG-20240731 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/668
 2024-07-31 17:10:44 +08:00
Leufolium 2eb44b548f by Robin at 20240731 2024-07-31 17:10:28 +08:00
chenhao e132aeb8bf Merge pull request '1' (#667) from feat-IRONFANS-176-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/667
 2024-07-31 16:50:59 +08:00
Leufolium bbb3f06e3a 1 2024-07-31 16:50:37 +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
chenhao 6bafe7e390 Merge pull request 'by Robin at 20240731' (#666) from feat-IRONFANS-176-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/666
 2024-07-31 16:09:06 +08:00
Leufolium 70febfc421 by Robin at 20240731 2024-07-31 16:08:51 +08:00
chenhao f6babbff70 Merge pull request '1' (#664) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/664
 2024-07-31 15:58:29 +08:00
lwl0608 2091ac23c8 fix 2024-07-31 14:55:46 +08:00
lwl0608 96325994ea fix code 2024-07-31 14:55:16 +08:00
chenhao d24ed470b0 Merge pull request 'by Robin at 20240729' (#662) from BUG-20240729 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/662
 2024-07-30 19:10:58 +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
chenhao 3d89cdb07c Merge pull request 'by Robin at 20240730; add delay' (#657) from feat-IRONFANS-166-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/657
 2024-07-30 12:15:35 +08:00
Leufolium c6e1a41288 by Robin at 20240730; add delay 2024-07-30 12:15:01 +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
lwl0608 940b5d7400 Merge branch 'add_raven' into test 2024-07-29 15:33:48 +08:00
lwl0608 759a138d06 outer raven 2024-07-29 15:33:42 +08:00
chenhao acf3e96a9d Merge pull request 'BUG-20240729' (#656) from BUG-20240729 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/656
 2024-07-29 13:15:38 +08:00
Leufolium 5eeebd4206 by Robin at 20240729 2024-07-29 13:15:11 +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 c2f89ac8e9 Merge branch 'feat-IRONFANS-166-Robin' into conf 2024-07-25 21:38:19 +08:00
Leufolium 34bbcdf627 1 2024-07-25 21:37:50 +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
Leufolium 4caefe3025 1 2024-07-25 20:29:08 +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 bb2c18fa4b 1 2024-07-25 20:11:38 +08:00
Leufolium 2ea3ebb6aa by Robin at 20240725 2024-07-25 19:59:35 +08:00
Leufolium 2a7c04d4ea 1 2024-07-25 17:49:13 +08:00
lwl0608 091a9b24a1 merg 2024-07-25 10:29:06 +08:00
lwl0608 cfdcc67c8f fix ch 2024-07-25 10:28:43 +08:00
lwl0608 fc37a1595f Merge branch 'fix_panicc' into test 2024-07-24 16:42:57 +08:00
lwl0608 33e8d70e24 fix panic 2024-07-24 16:42:49 +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
Leufolium d74af2c693 By Robin at 20240724 2024-07-24 14:14:26 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +08:00
chenhao 0defd56c6b Merge pull request '1' (#643) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/643
 2024-07-23 17:04:23 +08:00
Leufolium c5343564e3 1 2024-07-23 17:04:07 +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 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
lwl0608 9808ff020f Merge branch 'dev-lwl/rollback_zone_status' 2024-07-19 20:37:20 +08:00
lwl0608 ebd161ba90 Merge branch 'dev-lwl/rollback_zone_status' into test 2024-07-19 20:37:13 +08:00
lwl0608 bf994af7ab fix errmsg 2024-07-19 20:37:08 +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