Commit Graph

2108 Commits

Author SHA1 Message Date
chenhao 02d613ced8 Merge pull request 'by Robin at 20241017' (#761) from conf-IRONFANS-210 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/761
2024-10-17 19:53:37 +08:00
Leufolium 83a984eb17 by Robin at 20241017 2024-10-17 19:52:33 +08:00
chenhao c60194c221 Merge pull request 'conf-IRONFANS-210' (#760) from conf-IRONFANS-210 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/760
2024-10-17 11:24:56 +08:00
Leufolium 2df2341e6b Merge branch 'feat-IRONFANS-210-Robin' into conf-IRONFANS-210 2024-10-17 11:24:22 +08:00
Leufolium ee3a73d695 by Robin at 20241017 2024-10-17 11:22:49 +08:00
chenhao c537d82329 Merge pull request '1' (#758) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/758
2024-10-16 17:44:11 +08:00
Leufolium 055bbcdf82 1 2024-10-16 17:43:52 +08:00
chenhao 7a29452719 Merge pull request '1' (#757) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/757
2024-10-16 17:40:42 +08:00
Leufolium 7d80e09e44 1 2024-10-16 17:40:24 +08:00
chenhao 229d9f0039 Merge pull request 'conf-IRONFANS-231' (#756) from conf-IRONFANS-231 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/756
2024-10-16 17:33:17 +08:00
Leufolium 76574c4e18 Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231 2024-10-16 17:32:52 +08:00
Leufolium d9902a3f60 1 2024-10-16 17:30:15 +08:00
Leufolium eafb373bd4 by Robin at 20241016 2024-10-16 17:26:37 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +08:00
chenhao 5307e9b30c Merge pull request 'by Robin at 20241015' (#754) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/754
2024-10-15 16:55:18 +08:00
Leufolium 8c4579d749 by Robin at 20241015 2024-10-15 16:54:43 +08:00
chenhao 7372af7040 Merge pull request 'by Robin at 20241015' (#753) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/753
2024-10-15 16:02:45 +08:00
Leufolium 57f1775a2c by Robin at 20241015 2024-10-15 16:02:08 +08:00
lwl0608 c72f0555a1 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-12 16:34:07 +08:00
lwl0608 a1a414d6da fix 2024-10-12 16:33:58 +08:00
lwl0608 03d2923a7f freeze 2024-10-11 16:33:25 +08:00
lwl0608 cc1c626292 merge 2024-10-11 16:27:30 +08:00
lwl0608 aed10596a3 freeze_apollo 2024-10-11 16:26:41 +08:00
chenhao 8662ce92e4 Merge pull request 'by Robin at 20241011' (#752) from feat-IRONFANS-229-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/752
2024-10-11 16:10:46 +08:00
chenhao cacf2a6eb7 Merge pull request 'conflict' (#749) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/749
2024-10-11 15:27:29 +08:00
Leufolium 5295ffb251 Merge branch 'feat-IRONFANS-229-Robin' into conflict 2024-10-11 15:26:52 +08:00
Leufolium d1921bdab5 by Robin at 20241011 2024-10-11 15:24:06 +08:00
chenhao 05d1da9b1b Merge pull request 'by Robin at 20241011' (#747) from feat-IRONFANS-228-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/747
2024-10-11 13:52:32 +08:00
chenhao 3e578f080b Merge pull request 'by Robin at 20241011' (#746) from feat-IRONFANS-228-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/746
2024-10-11 13:44:19 +08:00
Leufolium c34a0f25f8 by Robin at 20241011 2024-10-11 13:43:45 +08:00
lwl0608 bef99c9ee1 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-11 00:37:04 +08:00
lwl0608 3d3513dcef fix 2024-10-11 00:37:00 +08:00
lwl0608 52811bbc7a Merge branch 'dev-lwl/unlock_opt' into test 2024-10-10 09:17:12 +08:00
lwl0608 0ca8714f12 freeze opt 2024-10-10 09:17:07 +08:00
lwl0608 45bbf40bf3 merge 2024-10-10 09:00:04 +08:00
lwl0608 cbf4cc764c freeze op 2024-10-10 08:59:27 +08:00
lwl0608 5371b90a1f Merge branch 'dev-lwl/freeze_func' into test 2024-10-10 08:26:09 +08:00
lwl0608 9f0c598e40 add freeze mid 513920 2024-10-10 08:26:05 +08:00
lwl0608 62e021dc6a Merge branch 'dev-lwl/freeze_func' into test 2024-10-09 21:07:44 +08:00
lwl0608 9836c10abe add freeze mid 2024-10-09 21:07:32 +08:00
lwl0608 2bc8ce98bd init 2024-10-09 21:06:26 +08:00
chenhao da8ef80293 Merge pull request 'BUG-20241004-Robin' (#745) from BUG-20241004-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/745
2024-10-04 17:21:02 +08:00
chenhao 30887c7b99 Merge pull request 'by Robin at 20241004' (#744) from BUG-20241004-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/744
2024-10-04 17:17:35 +08:00
Leufolium 4fc15bcf79 by Robin at 20241004 2024-10-04 17:17:21 +08:00
Leufolium 32d3d8ec01 by Robin at 20241004 2024-10-04 17:16:43 +08:00
chenhao 3c9e3303d8 Merge pull request 'BUG-20241004-Robin' (#743) from BUG-20241004-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/743
2024-10-04 17:10:35 +08:00
Leufolium e6794cf887 by Robin at 20241004; fix 2024-10-04 17:10:14 +08:00
lwl0608 9be64dca0c Merge branch 'dev-lwl/withdraw' 2024-09-28 21:31:16 +08:00
lwl0608 256706000f withdraw 2024-09-28 21:31:04 +08:00
lwl0608 9ed151c9d8 withdraw 2024-09-28 21:30:49 +08:00