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

456 Commits

Author SHA1 Message Date
Leufolium a59a4ca43f by Robin at 20240625 2024-06-25 17:48:24 +08:00
chenhao 35476f66a6 Merge pull request 'feat-IRONFANS-141-Robin' (#550) from feat-IRONFANS-141-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/550
 2024-06-25 17:44:48 +08:00
Leufolium 813636ca8f by Robin at 20240624 2024-06-24 19:14:31 +08:00
lwl0608 5f86fc08bb merge 2024-06-24 16:01:26 +08:00
lwl0608 e56ec4861b fix zone moment 2024-06-24 16:00:25 +08:00
Leufolium 210555f7d5 Merge branch 'feat-IRONFANS-141-Robin' into conf 2024-06-21 20:33:44 +08:00
Leufolium 177a95ac35 by Robin at 20240621 2024-06-21 20:28:40 +08:00
Leufolium 6fb44a3b01 by Robin at 20240621 2024-06-21 19:53:07 +08:00
Leufolium 41cf08be7c by Robin at 20240621 2024-06-21 19:51:55 +08:00
chenhao f7e6647b64 Merge pull request 'by Robin at 20240621' (#544) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/544
 2024-06-21 18:26:21 +08:00
Leufolium 9ee568f858 by Robin at 20240621 2024-06-21 18:25:24 +08:00
chenhao 606c7030a9 Merge pull request 'by Robin at 20240619' (#542) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/542
 2024-06-19 13:59:36 +08:00
Leufolium e6d1b90338 by Robin at 20240619 2024-06-19 13:58:47 +08:00
chenhao c9157d6a85 Merge pull request 'by Robin at 20240618' (#541) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/541
 2024-06-18 21:58:54 +08:00
Leufolium c0ccf23922 by Robin at 20240618 2024-06-18 21:58:29 +08:00
Leufolium 4f2d33e674 Merge branch 'feat-IRONFANS-148-Robin' into cfl 2024-06-18 19:46:31 +08:00
Leufolium ae4b8558f3 by Robin at 20240618 2024-06-18 19:40:09 +08:00
Leufolium 324d4bc523 by Robin at 20240618 2024-06-18 17:10:42 +08:00
Leufolium 6159759111 by Robin at 20240617 2024-06-17 22:25:43 +08:00
Leufolium 70422fce3a 1 2024-06-15 19:06:47 +08:00
lwl0608 7d27928218 fix 2024-06-15 14:29:35 +08:00
lwl0608 2cf1c99ce5 fix 2024-06-15 14:26:52 +08:00
Leufolium 400cda2cc3 by Robin at 20240615 2024-06-15 13:41:03 +08:00
lwl0608 591238f896 merge 2024-06-15 13:24:23 +08:00
lwl0608 f27c0b2de9 Merge branch 'dev-lwl/iap' into test 2024-06-15 13:19:24 +08:00
lwl0608 60a9eba321 fix 2024-06-15 13:19:10 +08:00
Leufolium f73dd1cff7 By Robin at 20240615 2024-06-15 11:41:12 +08:00
lwl0608 d73163a37f merge 2024-06-14 17:58:43 +08:00
lwl0608 f314affd2b Merge branch 'dev-lwl/iap' into test 2024-06-14 10:26:10 +08:00
lwl0608 67f144144f fix 2024-06-14 10:26:00 +08:00
lwl0608 064300871b fix 2024-06-14 10:20:08 +08:00
lwl0608 ebefdb66f0 Merge branch 'dev-lwl/iap' into test 2024-06-13 20:54:14 +08:00
lwl0608 30f18cf601 fx 2024-06-13 20:54:06 +08:00
lwl0608 d28f58a733 f 2024-06-13 16:43:31 +08:00
lwl0608 571a961151 apple 2024-06-13 16:40:22 +08:00
lwl0608 056fbabd14 proto 2024-06-12 23:45:03 +08:00
lwl0608 7df284d010 f 2024-06-09 00:02:37 +08:00
lwl0608 39ddeb698b merge 2024-06-04 17:46:47 +08:00
lwl0608 8bf8e9357f create order. add paytype: coin 2024-06-04 17:44:06 +08:00
chenhao 9358a749c7 Merge pull request 'feat-IRONFANS-58-Robin' (#524) from feat-IRONFANS-58-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/524
 2024-06-04 17:17:15 +08:00
chenhao 906f8ca05c Merge pull request 'by Robin at 20240530' (#519) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/519
 2024-05-30 15:24:11 +08:00
Leufolium a6e3a3ee12 by Robin at 20240530 2024-05-30 15:23:40 +08:00
lwl0608 1a4140c32a Merge branch 'dev-lwl/yop' into test 2024-05-30 11:10:03 +08:00
lwl0608 dcf2057a86 redirect url 2024-05-30 11:09:59 +08:00
lwl0608 b02fe65dd6 Merge branch 'dev-lwl/fix_unlock_superfan' into test 2024-05-29 15:26:31 +08:00
lwl0608 6d1e62324e manual unlock wechat 2024-05-29 15:26:24 +08:00
Leufolium 690a5b31f6 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-125-Robin 2024-05-28 13:11:21 +08:00
lwl0608 ad7dd3b052 Merge branch 'dev-lwl/yop' into test 2024-05-27 19:37:58 +08:00
lwl0608 fe3cb342d6 fix yeepay callback 2024-05-27 19:37:52 +08:00
lwl0608 99cd5896a0 merge 2024-05-27 16:54:34 +08:00
lwl0608 f34bf3670e yop 2024-05-27 16:48:25 +08:00
chenhao 2ff7822af8 Merge pull request 'feat-IRONFANS-133-Robin' (#510) from feat-IRONFANS-133-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/510
 2024-05-27 16:28:00 +08:00
Leufolium b8a9b7e66b by Robin at 20240524 2024-05-24 04:09:24 +08:00
Leufolium e3a91eed7a by Robin at 20240524 2024-05-24 04:08:43 +08:00
Leufolium b221fa7bfb Merge branch 'feat-IRONFANS-133-Robin' into conflict 2024-05-24 03:55:36 +08:00
Leufolium c2c8125b5f by 2024-05-24 03:52:57 +08:00
chenhao 31ac9a3b98 revert 4f67673057 
revert by Robin at 20240524
 2024-05-24 03:32:04 +08:00
Leufolium 4f67673057 by Robin at 20240524 2024-05-24 03:18:12 +08:00
Leufolium 63ba534b6e by Robin at 20240523 2024-05-23 04:10:10 +08:00
chenhao 7867bdb3a8 Merge pull request 'by Robin at 20240522' (#472) from feat-IRONFANS-118-Robin-2 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/472
 2024-05-22 23:20:50 +08:00
Leufolium a7e01c4dec by Robin at 20240522 2024-05-22 23:20:27 +08:00
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
chenhao 320792b4fe Merge pull request 'by' (#470) from feat-IRONFANS-118-Robin-2 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/470
 2024-05-21 23:31:26 +08:00
Leufolium 5247912764 by 2024-05-21 23:31:10 +08:00
Leufolium 0a287ebbfc by Robin at 20240521 2024-05-21 23:19:08 +08:00
Leufolium acb3e2fc24 Merge branch 'conf' of http://121.41.31.146:3000/wishpal_ironfan/service into conf 2024-05-21 23:16:20 +08:00
Leufolium 5cd103dac2 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin-2' into conf 2024-05-21 23:15:47 +08:00
Leufolium b8b228eb02 by Robin at 20240521 2024-05-21 23:12:25 +08:00
chenhao 36338ff2e8 by Robin at 20240521 2024-05-21 23:11:45 +08:00
chenhao 3ff0b4ed87 by Robin at 20240516 2024-05-21 23:06:48 +08:00
Leufolium 7c76dc449c by robin at 20240521 2024-05-21 23:06:30 +08:00
chenhao fbfaa11a0b Merge pull request 'by Robin at 20240521' (#464) from feat-IRONFANS-125-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/464
 2024-05-21 22:13:27 +08:00
Leufolium 1d2d8b1cc5 by Robin at 20240521 2024-05-21 22:12:59 +08:00
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +08:00
chenhao 568d7661f7 Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
 2024-05-18 00:34:39 +08:00
Leufolium 6ff619e386 1 2024-05-18 00:34:20 +08:00
chenhao 73be110ca6 Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
 2024-05-18 00:13:38 +08:00
Leufolium 853d231a9f by Robin at 20240518 2024-05-18 00:12:54 +08:00
Leufolium d089f30fb4 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into release-20240517 2024-05-17 16:17:46 +08:00
Leufolium f7c25ae1cc Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into release-20240517 2024-05-17 16:12:41 +08:00
chenhao f8775c6d17 Merge pull request 'feat-IRONFANS-112-Robin' (#448) from feat-IRONFANS-112-Robin into release-20240517 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/448
 2024-05-17 16:10:50 +08:00
lwl0608 16713c569f Merge branch 'dev-lwl/order' 2024-05-17 14:08:57 +08:00
Leufolium 54732df0d4 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin' into conf 2024-05-16 18:17:14 +08:00
Leufolium cee2242bc8 by Robin at 20240516 2024-05-16 18:15:03 +08:00
Leufolium 3d607a52a9 by Robin at 20240516 2024-05-16 16:31:55 +08:00
chenhao 1ddcca1b33 Merge pull request 'feat-IRONFANS-120-Robin' (#444) from feat-IRONFANS-120-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/444
 2024-05-16 14:40:50 +08:00
Leufolium 3a3c50f851 by Robin at 20240516 2024-05-16 14:40:22 +08:00
Leufolium 0d6097d174 by Robin at 20240516 2024-05-16 14:07:27 +08:00
Leufolium 757ca5edc6 Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf 2024-05-15 16:32:37 +08:00
Leufolium c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
Leufolium 07b587475b by Robin at 20240515 2024-05-15 16:29:59 +08:00
Leufolium 5016e7b7be by Robin at 20240515 2024-05-15 16:07:33 +08:00
Leufolium 0e6368fc0c by Robin at 20240515 2024-05-15 12:13:02 +08:00
Leufolium 7107bb0393 by Robin at 20240515 2024-05-15 09:58:45 +08:00
Leufolium a94e614427 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into conflict 2024-05-14 22:34:15 +08:00
Leufolium 4077eb2380 by Robin at 20240514 2024-05-14 22:31:33 +08:00
chenhao 1c6cfa8874 Merge pull request 'by Robin at 20240514' (#429) from feat-IRONFANS-121-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/429
 2024-05-14 17:23:12 +08:00
Leufolium 3dc9ca1665 by Robin at 20240514 2024-05-14 17:22:40 +08:00
lwl0608 961f37af1b fix 2024-05-14 10:58:07 +08:00
lwl0608 4bf3a744b3 本周迭代 2024-05-14 10:55:49 +08:00