Commit Graph

911 Commits

Author SHA1 Message Date
lwl0608 056fbabd14 proto 2024-06-12 23:45:03 +08:00
lwl0608 7df284d010 f 2024-06-09 00:02:37 +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 8bf8e9357f create order. add paytype: coin 2024-06-04 17:44:06 +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
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
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
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
Leufolium c2c8125b5f by 2024-05-24 03:52:57 +08:00
Leufolium dacbdcdd5d 111 2024-05-24 03:34:47 +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 248b93ced7 by Robin at 20240524 2024-05-24 02:52:23 +08:00
Leufolium 3c694f7995 1 2024-05-24 02:44:46 +08:00
Leufolium f7f0e53d5d by Robin at 20240524 2024-05-24 02:34:31 +08:00
Leufolium ceb46b5f38 1231231 2024-05-24 00:04:14 +08:00
Leufolium a54361d249 by Robin at 20240523 2024-05-23 23:59:14 +08:00
Leufolium ffececc65a by Robin at 20240523 2024-05-23 23:01:30 +08:00