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

1278 Commits

Author SHA1 Message Date
chenhao 497647dd99 Merge pull request 'by Robin at 20240626' (#555) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/555
 2024-06-26 12:44:34 +08:00
Leufolium 2cfe121fd1 by Robin at 20240626 2024-06-26 12:40:09 +08:00
Leufolium fd19b615b7 Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-06-25 18:31:54 +08:00
Leufolium 294f637de0 by Robin at 20240625 2024-06-25 18:23:18 +08:00
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
chenhao 5566efa436 Merge pull request 'by Robin at 20240624' (#549) from feat-IRONFANS-141-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/549
 2024-06-24 21:33:29 +08:00
Leufolium 5fcfea53ab by Robin at 20240624 2024-06-24 21:30:52 +08:00
Leufolium 45d78dfd17 1 2024-06-24 21:24:08 +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
chenhao aebca4b24d Merge pull request 'by Robin at 20240621' (#548) from feat-IRONFANS-141-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/548
 2024-06-21 21:28:28 +08:00
Leufolium 900a803525 by Robin at 20240621 2024-06-21 21:28:16 +08:00
Leufolium ce2931c057 1 2024-06-21 20:36:59 +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 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
chenhao ac3040a3eb Merge pull request 'main' (#543) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/543
 2024-06-21 18:26:04 +08:00
Leufolium 9ee568f858 by Robin at 20240621 2024-06-21 18:25:24 +08:00
lwl0608 b83aab01a7 fix 2024-06-19 21:56:57 +08:00
lwl0608 ff0c463020 fix update status 2024-06-19 21:10:46 +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
chenhao fe128454f7 Merge pull request 'by Robin at 20240618' (#540) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/540
 2024-06-18 21:34:59 +08:00
Leufolium 6dc4d0d736 by Robin at 20240618 2024-06-18 21:34:45 +08:00
chenhao 2a6c6197cb Merge pull request 'by Robin at 20240618' (#539) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/539
 2024-06-18 20:13:34 +08:00
Leufolium 440fcae93a by Robin at 20240618 2024-06-18 20:13:12 +08:00
chenhao d8151b4368 Merge pull request 'by Robin at 20240618' (#538) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/538
 2024-06-18 20:08:08 +08:00
Leufolium 4c0a61be43 by Robin at 20240618 2024-06-18 20:07:42 +08:00
chenhao 461baa8fcb Merge pull request '1' (#537) from feat-IRONFANS-148-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/537
 2024-06-18 19:51:37 +08:00
Leufolium 074d04b420 1 2024-06-18 19:51:22 +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
chenhao 39cb825dcb Merge pull request 'feat-IRONFANS-122-Robin' (#534) from feat-IRONFANS-122-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/534
 2024-06-15 17:58:54 +08:00
lwl0608 6381d071e1 merg 2024-06-15 14:35:43 +08:00
lwl0608 0e3e21cd86 create_order_wx_pub 2024-06-15 14:33:15 +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 97393ca46c refund 优化 2024-06-14 18:59:17 +08:00
lwl0608 59f495b266 fix 优化 2024-06-14 18:58:03 +08:00
lwl0608 28d31a6500 fix refund 2024-06-14 18:39:52 +08:00
lwl0608 ba0a6c25fb fix refund 2024-06-14 18:37:50 +08:00
lwl0608 8e4e6087b6 fix 2024-06-14 18:37:42 +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
chenhao 049f42fa7d Merge pull request 'feat-IRONFANS-122-Robin' (#532) from feat-IRONFANS-122-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/532
 2024-06-13 17:08:50 +08:00
Leufolium 61189f4bbe by Robin at 20240613 2024-06-13 17:08:29 +08:00
Leufolium b6441121fb by Robin at 20240613 2024-06-13 17:07:57 +08:00
lwl0608 25f8306229 Merge branch 'dev-lwl/iap' into test 2024-06-13 16:44:21 +08:00
lwl0608 da7a84905b applepay 2024-06-13 16:44:15 +08:00
lwl0608 d28f58a733 f 2024-06-13 16:43:31 +08:00
lwl0608 571a961151 apple 2024-06-13 16:40:22 +08:00
chenhao 136f96fdf5 Merge pull request 'by Robin at 20240613' (#531) from feat-IRONFANS-122-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/531
 2024-06-13 13:21:00 +08:00
Leufolium 601b8a5888 by Robin at 20240613 2024-06-13 13:20:43 +08:00
chenhao 7e7e21a3aa Merge pull request 'by Robin at 20240613' (#530) from feat-IRONFANS-147-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/530
 2024-06-13 12:56:45 +08:00
Leufolium e5fa00114c by Robin at 20240613 2024-06-13 12:56:29 +08:00
chenhao a614e015a4 Merge pull request 'feat-IRONFANS-147-Robin' (#529) from feat-IRONFANS-147-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/529
 2024-06-13 12:32:16 +08:00
Leufolium b45bddf849 by Robin at 20240613 2024-06-13 12:29:14 +08:00
lwl0608 3cf7e543fd t 2024-06-12 15:12:24 +08:00
Leufolium 559976b33a by Robin at 20240611 2024-06-11 19:40:35 +08:00
lwl0608 7df284d010 f 2024-06-09 00:02:37 +08:00
chenhao 624a521ad1 Merge pull request 'by Robin at 20240607; refund rate' (#526) from feat-IRONFANS-144-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/526
 2024-06-07 16:45:39 +08:00
Leufolium 4a57f04cf4 by Robin at 20240607; refund rate 2024-06-07 16:45:01 +08:00
lwl0608 551b9f10ee x 2024-06-05 10:53:18 +08:00
lwl0608 8ba557f493 add applepay_callback 2024-06-05 10:52:59 +08:00
lwl0608 3a4f4aacd2 fix 2024-06-04 17:50:03 +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
Leufolium 192b5c180e Merge remote-tracking branch 'origin/main' into test 2024-06-04 17:21:52 +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
Leufolium 84c371ca33 by Robin at 20240604 2024-06-04 17:03:14 +08:00
Leufolium 10636fa6a4 by Robin at 20240604 2024-06-04 12:16:17 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
chenhao 3deeb6be7d Merge pull request 'by Robin at 20240530' (#523) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/523
 2024-05-30 16:09:48 +08:00
Leufolium 3d2cc139d6 by Robin at 20240530 2024-05-30 16:01:19 +08:00
Leufolium c4ad05c918 Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into test 2024-05-30 15:53:58 +08:00
Leufolium eeb5baf1bf by Robin at 20240530 2024-05-30 15:52:49 +08:00
chenhao ce2d7f7260 Merge pull request 'by Robin at 20240530' (#520) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/520
 2024-05-30 15:38:10 +08:00
Leufolium ba5cd815ad by Robin at 20240530 2024-05-30 15:37:56 +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
chenhao d0d452a1f7 Merge pull request '1' (#517) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/517
 2024-05-30 14:58:14 +08:00
Leufolium 7b237ed87e 1 2024-05-30 14:58:00 +08:00
chenhao 52219a36c5 Merge pull request 'feat-IRONFANS-58-Robin' (#516) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/516
 2024-05-30 14:56:13 +08:00
Leufolium c9e6889aa2 by Robin at 20240530 2024-05-30 14:53:38 +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 f19658caf3 Merge branch 'dev-lwl/yop' into test 2024-05-30 09:48:17 +08:00
lwl0608 1920418c31 fix 2024-05-30 09:48:09 +08:00
lwl0608 10e55130a9 fix s w 2024-05-29 16:57:45 +08:00
lwl0608 33e44c9838 Merge branch 'dev-lwl/fix_unlock_superfan' into test 2024-05-29 16:14:56 +08:00
lwl0608 c5caa7bb75 superfan unlock wechat 2024-05-29 16:14:50 +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
lwl0608 fd79830b22 merge 2024-05-29 14:37:28 +08:00
lwl0608 4887207e0a withdraw recover 2024-05-29 14:35:52 +08:00
lwl0608 b5dca9fa04 Merge branch 'dev-lwl/yop' into test 2024-05-29 10:56:59 +08:00
lwl0608 cc93c10aa2 退款 2024-05-29 10:56:52 +08:00
Leufolium d9d60f69a6 by Robin at 20240529 2024-05-29 10:48:29 +08:00
Leufolium 690a5b31f6 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-125-Robin 2024-05-28 13:11:21 +08:00
Leufolium f780b95506 by Robin 2024-05-28 13:09:59 +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 31f4673b94 Merge branch 'dev-lwl/yop' into test 2024-05-27 19:23:13 +08:00
lwl0608 49561af1de fix yeepay callback 2024-05-27 19:23:05 +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
chenhao 72067fa808 Merge pull request 'main' (#509) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/509
 2024-05-25 19:03:36 +08:00
Leufolium ef00b9a1b7 by Robin at 20240525 2024-05-25 19:02:05 +08:00
Leufolium c8f9f00a13 by Robin at 20240525 2024-05-25 18:20:49 +08:00
chenhao 1ac088da88 Merge pull request 'main' (#506) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/506
 2024-05-25 13:15:16 +08:00
Leufolium 6c3fea0d1c by Robin at 20240525 2024-05-25 13:14:10 +08:00
chenhao e01f367782 Merge pull request 'main' (#504) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/504
 2024-05-25 12:03:58 +08:00
chenhao ba5d4f00f0 Merge pull request 'by Robin at 20240525; set ztp=nil if no ztp exists' (#503) from feat-IRONFANS-118-Robin-2 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/503
 2024-05-25 12:03:46 +08:00
Leufolium 531c84a2ea by Robin at 20240525; set ztp=nil if no ztp exists 2024-05-25 12:03:17 +08:00
Leufolium c44f8d3cab Merge remote-tracking branch 'origin/main' into test 2024-05-25 01:17:29 +08:00
chenhao 2e572ca814 Merge pull request 'by Robin at 20240525' (#501) from feat-IRONFANS-118-Robin-2 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/501
 2024-05-25 01:16:18 +08:00
Leufolium e72cd3e2c0 by Robin at 20240525 2024-05-25 01:15:47 +08:00
Leufolium 39d95f6ba8 by Robin at 20240524 2024-05-24 23:27:51 +08:00
Leufolium e141dc412c By Robin at 20240524 2024-05-24 23:27:05 +08:00
chenhao e0a7a1bb23 Merge pull request 'feat-IRONFANS-134-Robin' (#499) from feat-IRONFANS-134-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/499
 2024-05-24 22:43:54 +08:00
Leufolium 0d6a991101 by Robin at 20240524 2024-05-24 22:43:39 +08:00
chenhao 57499df522 Merge pull request 'by Robin at 20240524' (#497) from feat-IRONFANS-118-Robin-2 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/497
 2024-05-24 22:24:50 +08:00
Leufolium 5d67f05fd0 by Robin at 20240524 2024-05-24 22:24:27 +08:00
Leufolium 131b0d841f Merge branch 'feat-IRONFANS-125-Robin' into conflict 2024-05-24 19:32:16 +08:00
chenhao 1cd7e9b920 Merge pull request 'init offline' (#494) from feat-IRONFANS-133-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/494
 2024-05-24 08:59:43 +08:00
Leufolium 4bdee904d9 init offline 2024-05-24 08:59:21 +08:00
Leufolium 9308fbd796 by Robin 2024-05-24 08:38:58 +08:00
Leufolium 4983f71f0e by RObin 2024-05-24 04:30:34 +08:00
Leufolium 5698bee129 config path 2024-05-24 03:56:36 +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
Leufolium dacbdcdd5d 111 2024-05-24 03:34:47 +08:00
Leufolium 65ae43f8a5 return 2024-05-24 03:34:20 +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 7701447d64 Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conf 2024-05-24 02:59:59 +08:00
Leufolium 248b93ced7 by Robin at 20240524 2024-05-24 02:52:23 +08:00
chenhao 565ea600a1 Merge pull request '1' (#487) from feat-IRONFANS-133-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/487
 2024-05-24 02:46:28 +08:00
Leufolium 3c694f7995 1 2024-05-24 02:44:46 +08:00
Leufolium e428c72b6d Merge branch 'feat-IRONFANS-133-Robin' into conf 2024-05-24 02:36:19 +08:00
Leufolium f7f0e53d5d by Robin at 20240524 2024-05-24 02:34:31 +08:00
Leufolium 865ce9434d Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-24 00:00:40 +08:00
Leufolium a54361d249 by Robin at 20240523 2024-05-23 23:59:14 +08:00
Leufolium 76acec4cf9 Merge branch 'feat-IRONFANS-133-Robin' into test 2024-05-23 23:15:31 +08:00
Leufolium ffececc65a by Robin at 20240523 2024-05-23 23:01:30 +08:00
Leufolium 6907d7c8a2 by Robin at 20240523 2024-05-23 22:47:33 +08:00
Leufolium c9fa28946f Merge branch 'feat-IRONFANS-133-Robin' into conf 2024-05-23 22:44:51 +08:00
Leufolium 124dd84c83 by Robin at 20240523 2024-05-23 22:39:37 +08:00
Leufolium 8d36ca1d37 by Robin at 20240523 2024-05-23 17:11:14 +08:00
lwl0608 7cbce259b8 fix 2024-05-23 11:34:24 +08:00
Leufolium cddc6fe29a Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-23 04:12:37 +08:00
Leufolium 36f87c275e by Robin at 20240522 2024-05-22 23:35:07 +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
chenhao 40bafbb0af Merge pull request 'by Robin at 20240522' (#471) from feat-IRONFANS-118-Robin-2 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/471
 2024-05-22 22:57:14 +08:00
Leufolium 3b9f56d149 by Robin at 20240522 2024-05-22 22:56:47 +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 ab80a78cc7 by 2024-05-21 23:22:05 +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 a4cddc50c7 by Robin at 20240515 2024-05-21 22:58:09 +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
lwl0608 2d15e3bf70 ip 2024-05-21 19:58:24 +08:00
lwl0608 8107f4e4b9 fix 2024-05-21 19:57:46 +08:00
lwl0608 b2cc85ce8a fix 2024-05-21 19:57:46 +08:00
lwl0608 99f71d400b main 2024-05-21 19:57:46 +08:00
lwl0608 1a19cc2f08 fix 2024-05-21 19:57:46 +08:00
lwl0608 801fe5cbe0 fix 2024-05-21 19:57:46 +08:00
lwl0608 e84f94de68 fix log 2024-05-21 19:57:46 +08:00
lwl0608 388c5346bc revocer 2024-05-21 19:57:19 +08:00
lwl0608 5cc1fb426b fix log 2024-05-21 19:57:19 +08:00
lwl0608 0ec33fa81b consul 2024-05-21 19:57:19 +08:00
lwl0608 dc1feac378 vendor 2024-05-21 19:57:17 +08:00
lwl0608 2ae1c452b3 add 2024-05-21 19:56:53 +08:00
lwl0608 ee5585daf7 consul 2024-05-21 19:55:58 +08:00
Leufolium 9eb02d2788 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin' into conf 2024-05-21 18:37:01 +08:00
chenhao d5f5e3f25b Merge pull request 'main' (#461) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/461
 2024-05-21 18:27:41 +08:00
Leufolium 169a34247f by Robin at 20240521 2024-05-21 18:26:30 +08:00
lwl0608 ce46abfdca Merge branch 'dev-lwl/consul' into test 2024-05-21 17:36:39 +08:00
lwl0608 0cf3101f93 ip 2024-05-21 17:36:33 +08:00
lwl0608 bf987fe8da Merge branch 'dev-lwl/consul' into test 2024-05-21 17:08:13 +08:00
lwl0608 ad7a42a0f5 fix 2024-05-21 17:08:05 +08:00
Leufolium 62ae8742ba by Robin at 20240520 2024-05-20 18:16:17 +08:00
Leufolium 5eb15ae3a1 by Robin at 20240520 2024-05-20 18:12:22 +08:00
chenhao 90d11b400e Merge pull request 'feat-IRONFANS-129-Robin' (#460) from feat-IRONFANS-129-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/460
 2024-05-20 17:42:31 +08:00
chenhao bc30b6a7f7 Merge pull request 'by Robin at 20240520' (#459) from feat-IRONFANS-129-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/459
 2024-05-20 17:32:40 +08:00
Leufolium d1b1a62b8a by Robin at 20240520 2024-05-20 17:32:12 +08:00
chenhao 0fdf2e76c0 Merge pull request 'by Robin at 20240520' (#458) from feat-IRONFANS-129-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/458
 2024-05-20 16:15:24 +08:00
Leufolium b1b95821e1 by Robin at 20240520 2024-05-20 16:15:01 +08:00
Leufolium 112125e003 Merge remote-tracking branch 'origin/feat-IRONFANS-125-Robin' into conflict 2024-05-20 15:32:57 +08:00
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +08:00
Leufolium 1f5f5b57e0 by Robin at 20240520 2024-05-20 15:29:07 +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
chenhao 3bbbeee0ab Merge pull request 'by Robin at 20240517' (#453) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/453
 2024-05-17 18:58:13 +08:00
Leufolium f0198e6e71 by Robin at 20240517 2024-05-17 18:57:41 +08:00
chenhao 24a9e2236f Merge pull request 'by Robin at 20240517' (#452) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/452
 2024-05-17 18:42:19 +08:00
Leufolium 52e8d60715 by Robin at 20240517 2024-05-17 18:42:03 +08:00
Leufolium d089f30fb4 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into release-20240517 2024-05-17 16:17:46 +08:00
lwl0608 bb825aa93a fix 2024-05-17 16:14:23 +08:00
lwl0608 dfbc547781 fix 2024-05-17 16:13:50 +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 8fbbcc803e t 2024-05-17 15:46:08 +08:00
lwl0608 08fdb35594 Merge branch 'dev-lwl/consul' into test 2024-05-17 15:30:05 +08:00
lwl0608 1fbd46bde0 main 2024-05-17 15:30:00 +08:00
lwl0608 16713c569f Merge branch 'dev-lwl/order' 2024-05-17 14:08:57 +08:00
lwl0608 6a1db908d2 fix 2024-05-17 14:08:15 +08:00
lwl0608 e9f21d42d7 Merge branch 'dev-lwl/consul' into test 2024-05-17 10:59:56 +08:00
lwl0608 0598f99bd3 fix 2024-05-17 10:59:40 +08:00
lwl0608 930e39e500 Merge branch 'dev-lwl/consul' into test 2024-05-17 10:44:54 +08:00
lwl0608 38eebe5b35 fix 2024-05-17 10:44:48 +08:00
lwl0608 61f06ac60d fix 2024-05-16 23:49:13 +08:00
lwl0608 c976b01e8a vercmp 2024-05-16 23:33:37 +08:00
lwl0608 71f4a1e200 fix log 2024-05-16 22:26:06 +08:00
lwl0608 5dc4f6fbcc Merge branch 'dev-lwl/consul' into test 2024-05-16 22:10:20 +08:00
lwl0608 090e96c90e revocer 2024-05-16 22:10:14 +08:00
lwl0608 f1166624b1 Merge branch 'dev-lwl/consul' into test 2024-05-16 21:59:51 +08:00
lwl0608 7a4312fdff fix log 2024-05-16 21:59:45 +08:00
lwl0608 6a975818f7 merge 2024-05-16 21:08:42 +08:00
lwl0608 ae822fd49c consul 2024-05-16 20:43:21 +08:00
lwl0608 65152f30a7 add 2024-05-16 19:59:10 +08:00
lwl0608 34fa94bf1f consul 2024-05-16 19:59:10 +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
lwl0608 3ce8ba6efb merge 2024-05-16 16:50:29 +08:00
lwl0608 a05451e99a 取消提现限制 2024-05-16 16:49:20 +08:00