wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,218 Commits 89 Branches 0 Tags 39 MiB
Commit Graph

295 Commits

Author SHA1 Message Date
lwl0608 5aab80fcdd add media op 2024-05-07 10:50:40 +08:00
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
lwl0608 5247870a34 Merge branch 'feat-IRONFANS-70' into test 2024-04-19 23:33:08 +08:00
lwl0608 8fca291eb0 fix 2024-04-19 23:33:00 +08:00
lwl0608 d176749ecb Merge branch 'feat-IRONFANS-70' into test 2024-04-18 21:17:58 +08:00
lwl0608 43aa1516be 优化 2024-04-18 21:17:41 +08:00
lwl0608 90be5cb8cb Merge branch 'feat-IRONFANS-70' into test 2024-04-18 20:31:50 +08:00
lwl0608 82b927807a 优化 2024-04-18 20:31:43 +08:00
lwl0608 5981c7d076 Merge branch 'feat-IRONFANS-70' into test 2024-04-18 20:27:25 +08:00
lwl0608 e7ba504413 优化 2024-04-18 20:27:18 +08:00
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 6ed2b69550 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 21:54:46 +08:00
lwl0608 c3247fcf66 fix checkwallet 2024-04-16 21:49:18 +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
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
lwl0608 91a3bd5371 add 2024-04-12 10:01:56 +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
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
Leufolium acfe24623f by Robin at 20240411 2024-04-11 18:33:38 +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
Leufolium 31903d0ed0 by Robin at 20240411 2024-04-11 17:58:33 +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 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
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
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
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 5b292b346a by Robin at 20240411 2024-04-11 14:03:40 +08:00
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +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
Leufolium f96a04614a by Robin at 20240409 2024-04-09 19:19:16 +08:00
Leufolium e985e15ae1 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf 2024-04-08 20:14:44 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 5a333382ff Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf 2024-04-05 17:11:18 +08:00
Leufolium 2400311048 by Robin at 20240404 2024-04-04 21:03:32 +08:00
Leufolium 4820bd9503 by Robin at 20240404 2024-04-04 20:48:42 +08:00
Leufolium be27160261 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict 2024-04-03 16:55:08 +08:00
Leufolium 1650066959 by Robin at 20240403 2024-04-03 06:28:55 +08:00