Commit Graph

232 Commits

Author SHA1 Message Date
Leufolium 02e9883ffe by Robin at 20240717 2024-07-17 17:55:46 +08:00
Leufolium 7d22149037 1 2024-07-17 17:12:37 +08:00
lwl0608 655eb0368d create order blacklist 2024-07-04 14:11:57 +08:00
Leufolium d33813ee61 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-139-Robin 2024-07-03 16:53:02 +08:00
Leufolium 551d420c3f by Robin at 20240703 2024-07-03 15:13:04 +08:00
Leufolium 7dcde6a448 by Robin at 20240702 2024-07-02 17:15:54 +08:00
lwl0608 8d170ef8ef Merge branch 'dev_lwl' 2024-07-01 17:07:44 +08:00
lwl0608 8147201960 fix 2024-07-01 17:07:38 +08:00
lwl0608 0241e75edb merge 2024-07-01 16:00:39 +08:00
lwl0608 e19471c4bd fix 2024-07-01 15:59:42 +08:00
Leufolium af2c2fc366 by Robin at 20240628 2024-06-28 16:10:17 +08:00
Leufolium 4960594228 by Robin at 20240628 2024-06-28 15:35:12 +08:00
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +08:00
Leufolium ef33c42e0d 1 2024-06-26 18:13:09 +08:00
Leufolium 1124d413fa by Robin at 20240626 2024-06-26 17:37:00 +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
Leufolium 813636ca8f by Robin at 20240624 2024-06-24 19:14:31 +08:00
lwl0608 e56ec4861b fix zone moment 2024-06-24 16:00:25 +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
lwl0608 ff0c463020 fix update status 2024-06-19 21:10:46 +08:00
Leufolium e6d1b90338 by Robin at 20240619 2024-06-19 13:58:47 +08:00
Leufolium 6159759111 by Robin at 20240617 2024-06-17 22:25:43 +08:00
Leufolium 400cda2cc3 by Robin at 20240615 2024-06-15 13:41:03 +08:00
Leufolium e5fa00114c by Robin at 20240613 2024-06-13 12:56:29 +08:00
Leufolium b45bddf849 by Robin at 20240613 2024-06-13 12:29:14 +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
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
Leufolium d9d60f69a6 by Robin at 20240529 2024-05-29 10:48:29 +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 c8f9f00a13 by Robin at 20240525 2024-05-25 18:20:49 +08:00
Leufolium 6c3fea0d1c by Robin at 20240525 2024-05-25 13:14:10 +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
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
chenhao 36338ff2e8 by Robin at 20240521 2024-05-21 23:11:45 +08:00
Leufolium 7c76dc449c by robin at 20240521 2024-05-21 23:06:30 +08:00
lwl0608 e84f94de68 fix log 2024-05-21 19:57:46 +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
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 0c3bb46562 by Robin at 20240516 2024-05-16 16:00:20 +08:00
lwl0608 ce579b9701 add log 2024-05-15 19:57:52 +08:00
lwl0608 9b8b37d5e1 fix 2024-05-15 19:12:22 +08:00