Commit Graph

921 Commits

Author SHA1 Message Date
chenhao 984805dd83 Merge pull request 'by Robin at 20240607; refund rate' (#527) from feat-IRONFANS-144-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/527
2024-06-07 16:50:25 +08:00
Leufolium 4a57f04cf4 by Robin at 20240607; refund rate 2024-06-07 16:45:01 +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 b35e2ac7a3 Merge branch 'dev-lwl/consul' 2024-06-03 10:43:20 +08:00
lwl0608 541c40ccc5 c 2024-06-03 10:43:14 +08:00
lwl0608 173c312eb8 Merge branch 'dev-lwl/consul' 2024-06-03 10:33:36 +08:00
lwl0608 d25a7a13de log 2024-06-03 10:33:27 +08:00
lwl0608 3f34a7a8fe vendor 2024-06-03 10:30:13 +08:00
lwl0608 98760d185b t 2024-06-03 10:24:43 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
Leufolium 3d2cc139d6 by Robin at 20240530 2024-05-30 16:01:19 +08:00
Leufolium 092481224a b 2024-05-30 15:57:29 +08:00
Leufolium eeb5baf1bf by Robin at 20240530 2024-05-30 15:52:49 +08:00
Leufolium ba5cd815ad by Robin at 20240530 2024-05-30 15:37:56 +08:00
Leufolium a6e3a3ee12 by Robin at 20240530 2024-05-30 15:23:40 +08:00
Leufolium d1dcf7a7e1 yeepay 2024-05-30 15:05:59 +08:00
Leufolium 7b237ed87e 1 2024-05-30 14:58:00 +08:00
Leufolium c9e6889aa2 by Robin at 20240530 2024-05-30 14:53:38 +08:00
lwl0608 10e55130a9 fix s w 2024-05-29 16:57:45 +08:00
lwl0608 c5caa7bb75 superfan unlock wechat 2024-05-29 16:14:50 +08:00
lwl0608 6d1e62324e manual unlock wechat 2024-05-29 15:26:24 +08:00
lwl0608 4887207e0a withdraw recover 2024-05-29 14:35:52 +08:00
Leufolium d9d60f69a6 by Robin at 20240529 2024-05-29 10:48:29 +08:00
chenhao d5ae637214 Merge pull request 'feat-IRONFANS-125-Robin' (#515) from feat-IRONFANS-125-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/515
2024-05-28 13:11:39 +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
chenhao c3f1f2089d Merge pull request 'by Robin at 20240527; offline etc' (#511) from feat-IRONFANS-133-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/511
2024-05-27 16:38:39 +08:00
Leufolium 2c74eca4a8 by Robin at 20240527; offline etc 2024-05-27 16:38:19 +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 bda85caf00 Merge pull request 'by Robin at 20240525' (#508) from feat-IRONFANS-136-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/508
2024-05-25 19:02:29 +08:00
Leufolium ef00b9a1b7 by Robin at 20240525 2024-05-25 19:02:05 +08:00
chenhao abb4d1129a Merge pull request 'by Robin at 20240525' (#507) from feat-IRONFANS-136-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/507
2024-05-25 18:21:23 +08:00
Leufolium c8f9f00a13 by Robin at 20240525 2024-05-25 18:20:49 +08:00
chenhao d1e884f42f Merge pull request 'by Robin at 20240525' (#505) from feat-IRONFANS-136-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/505
2024-05-25 13:15:07 +08:00
Leufolium 6c3fea0d1c by Robin at 20240525 2024-05-25 13:14:10 +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
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
chenhao 359f1b6322 Merge pull request 'feat-IRONFANS-134-Robin' (#500) from feat-IRONFANS-134-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/500
2024-05-24 23:28:05 +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
Leufolium 0d6a991101 by Robin at 20240524 2024-05-24 22:43:39 +08:00
chenhao ab4a12073e Merge pull request 'feat-IRONFANS-118-Robin-2' (#498) from feat-IRONFANS-118-Robin-2 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/498
2024-05-24 22:27:47 +08:00
Leufolium 5d67f05fd0 by Robin at 20240524 2024-05-24 22:24:27 +08:00
Leufolium 4bdee904d9 init offline 2024-05-24 08:59:21 +08:00
Leufolium 4983f71f0e by RObin 2024-05-24 04:30:34 +08:00
Leufolium b8a9b7e66b by Robin at 20240524 2024-05-24 04:09:24 +08:00