Commit Graph

191 Commits

Author SHA1 Message Date
chenhao 78e5e6a33a Merge pull request 'feat-IRONFANS-70' (#301) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/301
2024-04-18 06:00:15 +08:00
chenhao 9436053275 Merge pull request 'by Robin at 20240418' (#300) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/300
2024-04-18 05:59:58 +08:00
Leufolium 4fc3732b94 by Robin at 20240418 2024-04-18 05:59:11 +08:00
lwl0608 563e007d92 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 21:13:39 +08:00
lwl0608 03fdc98f3d 修复 2024-04-16 21:13:26 +08:00
lwl0608 ca7ec97855 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 20:21:09 +08:00
lwl0608 5dedd4fd27 fix db 2024-04-16 20:20:53 +08:00
chenhao 0d2fab9ed1 Merge pull request 'feat-IRONFANS-70' (#297) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/297
2024-04-16 19:48:40 +08:00
Leufolium 50ef95271c by Robin at 20240416 2024-04-16 19:48:15 +08:00
chenhao a44167db93 Merge pull request 'feat-IRONFANS-70' (#295) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/295
2024-04-16 19:11:02 +08:00
Leufolium 5cd1cbf027 by Robin at 20240416 2024-04-16 19:10:04 +08:00
lwl0608 c3200bcf2a Merge branch 'feat-IRONFANS-70' into test 2024-04-16 10:49:26 +08:00
lwl0608 9fdbd5bcb2 add 2024-04-16 10:49:02 +08:00
lwl0608 5c01857d28 add 2024-04-16 09:51:39 +08:00
chenhao a1d6d0eda1 Merge pull request 'feat-IRONFANS-70' (#290) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/290
2024-04-16 07:43:02 +08:00
Leufolium da6d60020c by Robin at 20240416 2024-04-16 07:41:52 +08:00
lwl0608 eb3d14199e vas 2024-04-15 15:17:30 +08:00
chenhao 1830fcdc2a Merge pull request 'feat-IRONFANS-70' (#287) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/287
2024-04-12 23:07:31 +08:00
chenhao c1a2237479 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#286) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/286
2024-04-12 23:07:12 +08:00
Leufolium e986f9ba07 by Robin at 20240412 2024-04-12 23:02:55 +08:00
chenhao b0c3908130 Merge pull request 'feat-IRONFANS-70' (#285) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/285
2024-04-12 06:46:15 +08:00
chenhao 4e99c4fe82 Merge pull request 'b' (#284) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/284
2024-04-12 06:46:07 +08:00
Leufolium 156cc92de9 b 2024-04-12 06:45:51 +08:00
chenhao a51b63478e Merge pull request 'feat-IRONFANS-70' (#283) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/283
2024-04-12 06:43:30 +08:00
Leufolium 648a860a83 Merge branch 'dev-feat-IRONFANS-70-Robin' into conflict-feat-IRONFANS-70 2024-04-12 06:43:00 +08:00
Leufolium 52624ac592 by Robin at 20240411 2024-04-12 06:40:30 +08:00
chenhao 20be36d9b4 Merge pull request 'feat-IRONFANS-70' (#278) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/278
2024-04-11 21:57:12 +08:00
chenhao c420f41c05 Merge pull request 'by Robin at 20240411' (#277) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/277
2024-04-11 21:57:03 +08:00
Leufolium 1ecae673f6 by Robin at 20240411 2024-04-11 21:56:48 +08:00
chenhao a7f9a76be0 Merge pull request 'feat-IRONFANS-70' (#268) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/268
2024-04-11 19:35:23 +08:00
chenhao 127c289735 Merge pull request 'by Robin at 20240411' (#267) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/267
2024-04-11 19:35:10 +08:00
Leufolium c89082aea9 by Robin at 20240411 2024-04-11 19:34:51 +08:00
chenhao 9d53f252ce Merge pull request 'feat-IRONFANS-70' (#266) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/266
2024-04-11 18:34:05 +08:00
chenhao 1301c0a9ec Merge pull request 'by Robin at 20240411' (#265) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/265
2024-04-11 18:33:56 +08:00
Leufolium acfe24623f by Robin at 20240411 2024-04-11 18:33:38 +08:00
chenhao a7a036f562 Merge pull request 'feat-IRONFANS-70' (#264) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/264
2024-04-11 18:20:03 +08:00
chenhao 469c7f8775 Merge pull request 'by Robin at 20240411' (#263) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/263
2024-04-11 18:19:55 +08:00
Leufolium 776e50f148 by Robin at 20240411 2024-04-11 18:19:34 +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
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
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
Leufolium 76f35eaced b 2024-04-11 16:15:46 +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
Leufolium 0975288b86 by Robin at 20240411 2024-04-11 15:46:01 +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
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +08:00