Commit Graph

210 Commits

Author SHA1 Message Date
chenhao 03b00506dc Merge pull request 'by Robin at 20240507; set is_hided for zone third partner' (#406) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/406
2024-05-07 16:59:29 +08:00
Leufolium 7b385f395d by Robin at 20240507; set is_hided for zone third partner 2024-05-07 16:59:10 +08:00
lwl0608 f247f2ddc1 merge 2024-05-07 10:51:11 +08:00
lwl0608 5aab80fcdd add media op 2024-05-07 10:50:40 +08:00
lwl0608 5542905db3 Merge branch 'dev-lwl/fix' into test 2024-05-06 23:28:29 +08:00
lwl0608 b196114623 add withdraw freeze 2024-05-06 23:28:22 +08:00
lwl0608 3c3c849213 Merge branch 'dev-lwl/fix' into test 2024-05-03 19:39:38 +08:00
lwl0608 affc815e8e fix is_moment_image_encrypt_enabled 2024-05-03 19:39:29 +08:00
chenhao a0dac18ede Merge pull request 'feat-IRONFANS-70' (#395) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/395
2024-05-01 03:28:28 +08:00
Leufolium d494eb921b by Robin at 20240501 2024-05-01 02:51:47 +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 1ac73882d1 by Robin at 20240430 2024-04-30 09:51:23 +08:00
chenhao b0fc62679e Merge pull request 'by Robin at 20240430' (#385) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/385
2024-04-30 09:23:24 +08:00
Leufolium 7f18d00df4 by Robin at 20240430 2024-04-30 09:22:18 +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 53bfdfe33c Merge branch 'dev-lwl/zone' into test 2024-04-28 18:00:17 +08:00
lwl0608 8db2ce1071 fix 2024-04-28 17:59:57 +08:00
lwl0608 9509d63858 Merge branch 'main' into test 2024-04-28 17:37:04 +08:00
chenhao 6bf1f9e472 Merge pull request 'by Robin at 20240427' (#367) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/367
2024-04-27 19:50:09 +08:00
Leufolium 27cda44de3 by Robin at 20240427 2024-04-27 19:48:57 +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 edb5caf001 by Robin at 20240427 2024-04-27 11:14:44 +08:00
Leufolium b53a96d3bf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin 2024-04-27 08:27:34 +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 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
chenhao c922628f5a Merge pull request 'main' (#352) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/352
2024-04-26 14:55:04 +08:00
Leufolium 2ac68c47c7 by Robin at 20240426 2024-04-26 14:54:27 +08:00
Leufolium 0630bd9a18 by Robin at 20240426 2024-04-26 10:46:37 +08:00
lwl0608 f80bfb3ab5 fix 2024-04-26 01:30:40 +08:00
lwl0608 60dd9b28c5 add wxpay callback manul 2024-04-26 01:29:36 +08:00
chenhao 5a12f77380 Merge pull request 'feat-IRONFANS-70' (#317) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/317
2024-04-22 18:57:22 +08:00
chenhao 71ccf53d70 Merge pull request 'by Robin at 20240422' (#316) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/316
2024-04-22 18:57:12 +08:00
Leufolium 50fa5e32b7 by Robin at 20240422 2024-04-22 18:56:53 +08:00
chenhao 3a3448e873 Merge pull request 'feat-IRONFANS-70' (#313) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/313
2024-04-22 18:20:47 +08:00
chenhao 796e09af2f Merge pull request 'by Robin at 20240422' (#312) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/312
2024-04-22 18:20:36 +08:00
Leufolium ab8db00368 by Robin at 20240422 2024-04-22 18:19:37 +08:00
chenhao dbafa1917e Merge pull request 'feat-IRONFANS-70' (#307) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/307
2024-04-22 07:16:53 +08:00
chenhao a5837da513 Merge pull request 'by Robin at 20240422' (#306) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/306
2024-04-22 07:16:39 +08:00
Leufolium f0074facd9 by Robin at 20240422 2024-04-22 07:15:46 +08:00
lwl0608 372e548c5d Merge branch 'feat-IRONFANS-70' into test 2024-04-18 22:53:31 +08:00
lwl0608 b4d52e3a2c fix 2024-04-18 22:53:25 +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 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 757654bd71 Merge pull request 'feat-IRONFANS-70' (#299) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/299
2024-04-17 23:40:22 +08:00
chenhao 4911ff6add Merge pull request 'by Robin at 20240417' (#298) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/298
2024-04-17 23:40:11 +08:00