Commit Graph

1052 Commits

Author SHA1 Message Date
Leufolium cd6b6de15b by Robin at 20240711 2024-07-11 11:10:25 +08:00
chenhao ab07bcfadf Merge pull request 'by Robin at 20240711' (#610) from BUG-20240711 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/610
2024-07-11 08:15:09 +08:00
Leufolium 87fc79d62a by Robin at 20240711 2024-07-11 08:14:34 +08:00
lwl0608 bfc5c9f810 black 2024-07-09 09:47:28 +08:00
lwl0608 f45ec3e11e fix 2024-07-08 02:00:53 +08:00
lwl0608 72d2521a3b fix 2024-07-08 01:56:50 +08:00
lwl0608 655eb0368d create order blacklist 2024-07-04 14:11:57 +08:00
chenhao 9a659d9b74 Merge pull request 'by Robin at 20240701' (#592) from feat-pay_add_token into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/592
2024-07-03 17:15:54 +08:00
chenhao 26c781fce7 Merge pull request 'feat-IRONFANS-139-Robin' (#591) from feat-IRONFANS-139-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/591
2024-07-03 16:54:02 +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
chenhao 688470d37a Merge pull request 'feat-IRONFANS-160-Robin' (#586) from feat-IRONFANS-160-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/586
2024-07-02 21:12:59 +08:00
Leufolium 561df91f82 1 2024-07-02 19:57:28 +08:00
Leufolium 0836a4baea by Robin at 20240702 2024-07-02 19:53:29 +08:00
Leufolium c022b0246a 1 2024-07-02 18:42:32 +08:00
Leufolium faa900a4cd by Robin at 20240702 2024-07-02 18:40:00 +08:00
chenhao a3db54f64e Merge pull request 'by Robin at 20240702' (#581) from feat-IRONFANS-158-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/581
2024-07-02 17:18:34 +08:00
Leufolium 7dcde6a448 by Robin at 20240702 2024-07-02 17:15:54 +08:00
Leufolium c9e50ef864 by Robin at 20240702 2024-07-02 16:29:08 +08:00
Leufolium be67c8f461 by Robin at 20240701 2024-07-01 17:55:41 +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
chenhao 07c2a01aaa Merge pull request 'by Robin at 20240628' (#576) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/576
2024-06-28 23:32:59 +08:00
Leufolium 02ee882bd5 by Robin at 20240628 2024-06-28 23:32:44 +08:00
chenhao b468b42b5c Merge pull request 'by Robin at 20240628' (#575) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/575
2024-06-28 23:25:49 +08:00
Leufolium 1575046a98 by Robin at 20240628 2024-06-28 23:25:22 +08:00
chenhao 19bc740f7f Merge pull request 'by Robin at 20240628' (#575) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/575
2024-06-28 23:13:58 +08:00
Leufolium 3a83ade89f by Robin at 20240628 2024-06-28 23:13:21 +08:00
lwl0608 ef7894de9a jwt 2024-06-28 22:37:42 +08:00
lwl0608 a54cd4fce4 jwt 2024-06-28 22:36:54 +08:00
chenhao 2bf04aac1b Merge pull request 'by Robin at 20240628' (#574) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/574
2024-06-28 20:39:51 +08:00
Leufolium 213cc36149 by Robin at 20240628 2024-06-28 20:39:34 +08:00
chenhao 06bc65c750 Merge pull request 'by Robin at 20240628' (#573) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/573
2024-06-28 20:28:48 +08:00
Leufolium d01ad4bdac by Robin at 20240628 2024-06-28 20:28:32 +08:00
chenhao dd98bbf779 Merge pull request 'by Robin at 20240628' (#572) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/572
2024-06-28 18:02:31 +08:00
Leufolium e919a70b1d by Robin at 20240628 2024-06-28 18:02:13 +08:00
chenhao c5ba290745 Merge pull request 'by Robin at 20240628' (#571) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/571
2024-06-28 16:10:39 +08:00
Leufolium af2c2fc366 by Robin at 20240628 2024-06-28 16:10:17 +08:00
chenhao b167ff5aaa Merge pull request 'by Robin at 20240628' (#570) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/570
2024-06-28 15:47:54 +08:00
Leufolium 2e9177c65c by Robin at 20240628 2024-06-28 15:47:40 +08:00
chenhao 817ceb47a2 Merge pull request 'by Robin at 20240628' (#569) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/569
2024-06-28 15:35:57 +08:00
Leufolium 4960594228 by Robin at 20240628 2024-06-28 15:35:12 +08:00
chenhao 5243d1e44a Merge pull request 'feat-IRONFANS-148-Robin' (#568) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/568
2024-06-28 14:36:43 +08:00
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +08:00
lwl0608 bbc808e27a fix 2024-06-28 14:33:01 +08:00
chenhao c887c8238b Merge pull request 'feat-IRONFANS-120-Robin' (#566) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/566
2024-06-27 22:08:13 +08:00
Leufolium 408f786227 by Robin at 20240627 2024-06-27 18:42:33 +08:00
Leufolium 3a1e5bfe9d by Robin at 20240627 2024-06-27 18:31:41 +08:00