wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
990 Commits 84 Branches 0 Tags 35 MiB
Commit Graph

244 Commits

Author SHA1 Message Date
chenhao e3ae837488 Merge pull request 'by Robin at 20240501' (#400) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/400
 2024-05-01 05:04:34 +08:00
Leufolium 2b8d9bf4bf by Robin at 20240501 2024-05-01 05:04:08 +08:00
Leufolium d642ca7dc0 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-05-01 01:11:00 +08:00
Leufolium 7e71e670c0 Merge branch 'feat-IRONFANS-70' into conflict 2024-04-30 09:52:51 +08:00
Leufolium aa32674ed3 by Robin at 20240430 2024-04-30 09:40:19 +08:00
chenhao 9c893d4a9c Merge pull request 'feat-IRONFANS-86-Robin' (#378) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/378
 2024-04-29 22:20:05 +08:00
lwl0608 3dc8a84b7c Merge branch 'dev-lwl/zone' into test 2024-04-29 17:39:59 +08:00
lwl0608 715ff91c51 zone_refund_list 2024-04-29 17:39:49 +08:00
lwl0608 1b17cf1a79 Merge branch 'dev-lwl/zone' into test 2024-04-29 16:08:59 +08:00
lwl0608 cc7a910b72 fix zone ferund 2024-04-29 16:08:51 +08:00
lwl0608 31c2dc1039 Merge branch 'dev-lwl/zone' into test 2024-04-29 15:56:49 +08:00
lwl0608 a8d3a45b71 rollback ironfanship 2024-04-29 15:56:42 +08:00
lwl0608 1bd1cfd161 Merge branch 'dev-lwl/zone' into test 2024-04-29 15:47:56 +08:00
lwl0608 c470a8e77f add zone refund 2024-04-29 15:47:45 +08:00
chenhao 8ae3052741 Merge pull request 'feat-IRONFANS-86-Robin' (#377) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/377
 2024-04-29 15:32:43 +08:00
Leufolium b67c503e80 by Robin at 20240429 2024-04-29 15:31:54 +08:00
chenhao 0c86d4db01 Merge pull request 'feat-IRONFANS-86-Robin' (#365) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/365
 2024-04-27 11:17:19 +08:00
Leufolium b53a96d3bf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin 2024-04-27 08:27:34 +08:00
Leufolium acf047e66f Merge remote-tracking branch 'origin/main' into conflict 2024-04-27 08:24:56 +08:00
chenhao 79df3e410e Merge pull request 'feat-IRONFANS-70' (#360) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/360
 2024-04-27 00:48:29 +08:00
chenhao 0562e5cdc5 Merge pull request 'by Robin at 20240427' (#357) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/357
 2024-04-27 00:28:34 +08:00
Leufolium 9fed951998 by Robin at 20240427 2024-04-27 00:27:53 +08:00
chenhao 7dcc739c86 Merge pull request 'by Robin at 20240426' (#356) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/356
 2024-04-26 23:02:12 +08:00
Leufolium 7cb60f01b6 by Robin at 20240426 2024-04-26 23:01:55 +08:00
Leufolium 05c247314b by Robin at 20240426 2024-04-26 19:45:20 +08:00
chenhao 3908f40305 Merge pull request 'by Robin at 20240426' (#353) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/353
 2024-04-26 14:55:18 +08:00
Leufolium 2ac68c47c7 by Robin at 20240426 2024-04-26 14:54:27 +08:00
chenhao 629555ad36 Merge pull request 'feat-IRONFANS-70' (#351) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/351
 2024-04-26 11:22:48 +08:00
chenhao 402b991583 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#350) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/350
 2024-04-26 11:22:33 +08:00
Leufolium 3076813dfb by Robin at 20240426; rollback create times of deleted zone moment 2024-04-26 10:48:57 +08:00
Leufolium 0630bd9a18 by Robin at 20240426 2024-04-26 10:46:37 +08:00
chenhao ed836112fd Merge pull request 'feat-IRONFANS-70' (#334) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/334
 2024-04-25 17:21:15 +08:00
chenhao 2890f1e498 Merge pull request 'by Robin at 20240425' (#333) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/333
 2024-04-25 17:21:01 +08:00
Leufolium 8f574d73fb by Robin at 20240425 2024-04-25 17:20:35 +08:00
chenhao fe866863e6 Merge pull request 'feat-IRONFANS-70' (#330) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/330
 2024-04-25 10:02:45 +08:00
chenhao b74f7540b8 Merge pull request 'by Robin at 20240425' (#329) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/329
 2024-04-25 10:02:33 +08:00
Leufolium 3fef23d3c3 by Robin at 20240425 2024-04-25 10:01:34 +08:00
lwl0608 87fe741ebc Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:20:44 +08:00
lwl0608 4da4ca70d1 get zone by mid 2024-04-24 21:20:31 +08:00
chenhao 41aa31cb23 Merge pull request 'feat-IRONFANS-70' (#328) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/328
 2024-04-24 20:17:38 +08:00
chenhao 2a84d99b65 Merge pull request 'by Robin at 20240424' (#327) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/327
 2024-04-24 20:17:18 +08:00
Leufolium 5d7220246e by Robin at 20240424 2024-04-24 20:16:22 +08:00
lwl0608 77bfb2e1d5 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:22:58 +08:00
lwl0608 9cd894a47b fix chaofen song weixin 2024-04-23 17:22:47 +08:00
chenhao 569598795e Merge pull request 'feat-IRONFANS-70' (#324) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/324
 2024-04-22 20:19:52 +08:00
Leufolium 0eef3c0aef by Robin at 20240422 2024-04-22 20:19:17 +08:00
lwl0608 5d0f4fe0a6 Merge branch 'feat-IRONFANS-70' into test 2024-04-19 23:55:04 +08:00
lwl0608 fcb867cc88 add moment 2024-04-19 23:54:56 +08:00
lwl0608 31e925cd19 Merge branch 'feat-IRONFANS-70' into test 2024-04-19 23:41:24 +08:00
lwl0608 806c223a8b fix 2024-04-19 23:41:18 +08:00