Commit Graph

828 Commits

Author SHA1 Message Date
chenhao bf7e97847e Merge pull request 'feat-IRONFANS-70' (#262) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/262
2024-04-11 18:17:55 +08:00
chenhao e19fb1724e Merge pull request 'by Robin at 20240411' (#261) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/261
2024-04-11 18:17:47 +08:00
Leufolium 50945229e6 by Robin at 20240411 2024-04-11 18:17:32 +08:00
chenhao 3ece8f7504 Merge pull request 'feat-IRONFANS-70' (#260) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/260
2024-04-11 17:59:45 +08:00
chenhao cc7745ee62 Merge pull request 'by Robin at 20240411' (#259) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/259
2024-04-11 17:59:03 +08:00
Leufolium 31903d0ed0 by Robin at 20240411 2024-04-11 17:58:33 +08:00
lwl0608 8f24732eb4 udpate proto 2024-04-11 17:57:01 +08:00
lwl0608 aff4682096 fix proto 2024-04-11 17:51:41 +08:00
lwl0608 1aa8641cd2 protos 2024-04-11 17:47:24 +08:00
chenhao 381cd689ba Merge pull request 'feat-IRONFANS-70' (#258) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/258
2024-04-11 16:53:04 +08:00
chenhao 6c27797052 Merge pull request 'by Robin at 20240411' (#257) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/257
2024-04-11 16:52:46 +08:00
Leufolium 0dd9eb1360 by Robin at 20240411 2024-04-11 16:52:30 +08:00
chenhao 706546cb1f Merge pull request 'feat-IRONFANS-70' (#256) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/256
2024-04-11 16:16:11 +08:00
chenhao 34b6fa0d6c Merge pull request 'b' (#255) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/255
2024-04-11 16:16:01 +08:00
Leufolium 76f35eaced b 2024-04-11 16:15:46 +08:00
chenhao 25b311a326 Merge pull request 'feat-IRONFANS-70' (#254) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/254
2024-04-11 16:08:33 +08:00
chenhao 9df546d3c5 Merge pull request 'by Robin at 20240411' (#253) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/253
2024-04-11 16:08:22 +08:00
Leufolium 1c5a9bbdc5 by Robin at 20240411 2024-04-11 16:08:05 +08:00
chenhao 6b2cef4112 Merge pull request 'feat-IRONFANS-70' (#252) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/252
2024-04-11 15:55:40 +08:00
chenhao 6cc3b745d6 Merge pull request 'by Robin at 20240411' (#251) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/251
2024-04-11 15:55:30 +08:00
Leufolium b7e5eda22d by Robin at 20240411 2024-04-11 15:55:14 +08:00
chenhao 711aaa3d03 Merge pull request 'feat-IRONFANS-70' (#250) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/250
2024-04-11 15:46:38 +08:00
chenhao 74018711d0 Merge pull request 'by Robin at 20240411' (#249) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/249
2024-04-11 15:46:23 +08:00
Leufolium 0975288b86 by Robin at 20240411 2024-04-11 15:46:01 +08:00
chenhao f27d653c9e Merge pull request 'feat-IRONFANS-70' (#248) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/248
2024-04-11 14:40:50 +08:00
chenhao b6db8d157a Merge pull request 'b' (#247) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/247
2024-04-11 14:40:38 +08:00
Leufolium 9e1ec21e31 b 2024-04-11 14:40:18 +08:00
chenhao f88e5e1ab7 Merge pull request 'feat-IRONFANS-70' (#246) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/246
2024-04-11 14:38:15 +08:00
chenhao ee6f7b4433 Merge pull request 'by Robin at 20240411' (#245) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/245
2024-04-11 14:38:03 +08:00
Leufolium cc882c203d by Robin at 20240411 2024-04-11 14:37:45 +08:00
chenhao b565383703 Merge pull request 'feat-IRONFANS-70' (#244) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/244
2024-04-11 14:04:53 +08:00
chenhao 14fe2223ac Merge pull request 'dev-feat-IRONFANS-70-Robin' (#243) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/243
2024-04-11 14:04:11 +08:00
Leufolium 5b292b346a by Robin at 20240411 2024-04-11 14:03:40 +08:00
Leufolium ab65df6d06 by Robin at 20240411 2024-04-11 14:01:26 +08:00
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +08:00
chenhao 0f3bd18a99 Merge pull request 'feat-IRONFANS-70' (#242) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/242
2024-04-09 22:38:07 +08:00
chenhao d51b312e11 Merge pull request 'by Robin at 20240409' (#241) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/241
2024-04-09 22:37:55 +08:00
Leufolium 67949942be by Robin at 20240409 2024-04-09 22:37:12 +08:00
chenhao 580e55829a Merge pull request 'feat-IRONFANS-70' (#240) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/240
2024-04-09 19:19:51 +08:00
chenhao cf8fb6b635 Merge pull request 'by Robin at 20240409' (#239) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/239
2024-04-09 19:19:36 +08:00
Leufolium f96a04614a by Robin at 20240409 2024-04-09 19:19:16 +08:00
chenhao c8079c6142 Merge pull request 'conf' (#238) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/238
2024-04-08 20:16:07 +08:00
Leufolium e985e15ae1 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf 2024-04-08 20:14:44 +08:00
chenhao d4f345ec08 Merge pull request 'by Robin at 20240408' (#235) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/235
2024-04-08 20:05:58 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
chenhao 81b4fc4e85 Merge pull request 'feat-IRONFANS-70' (#234) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/234
2024-04-05 19:24:27 +08:00
chenhao f0bb3d9cd9 Merge pull request 'by Robin at 20240405;' (#233) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/233
2024-04-05 19:24:14 +08:00
Leufolium 3b56c2df7c by Robin at 20240405; 2024-04-05 19:23:36 +08:00
chenhao 2d880c16f5 Merge pull request 'cf' (#232) from cf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/232
2024-04-05 17:13:46 +08:00
Leufolium 5a333382ff Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf 2024-04-05 17:11:18 +08:00