Commit Graph

1091 Commits

Author SHA1 Message Date
chenhao e1d6fb9b15 Merge pull request 'by Robin at 20240627' (#565) from feat-IRONFANS-120-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/565
2024-06-27 18:31:56 +08:00
Leufolium 3a1e5bfe9d by Robin at 20240627 2024-06-27 18:31:41 +08:00
Leufolium 2f089b0113 Merge branch 'feat-IRONFANS-139-Robin' into conf 2024-06-27 18:20:52 +08:00
Leufolium 6b730ba361 by Robin at 20240627 2024-06-27 18:19:11 +08:00
chenhao 837a98c7fc Merge pull request 'by Robin at 20240627' (#561) from BUG-20240627-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/561
2024-06-27 15:21:05 +08:00
Leufolium 66270eb80d by Robin at 20240627 2024-06-27 15:20:21 +08:00
chenhao 2f1d45a898 Merge pull request '1' (#560) from feat-IRONFANS-120-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/560
2024-06-26 18:13:24 +08:00
Leufolium ef33c42e0d 1 2024-06-26 18:13:09 +08:00
Leufolium 7bf51c7a87 Merge branch 'feat-IRONFANS-120-Robin' into conflict 2024-06-26 17:39:27 +08:00
Leufolium 1124d413fa by Robin at 20240626 2024-06-26 17:37:00 +08:00
chenhao 160e5af3b8 Merge pull request 'feat-IRONFANS-148-Robin' (#557) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/557
2024-06-26 13:31:26 +08:00
Leufolium af835ff284 by Robin at 20240626 2024-06-26 13:30:32 +08:00
Leufolium 7e8c00e926 by Robin at 20240626 2024-06-26 13:26:46 +08:00
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