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

282 Commits

Author SHA1 Message Date
lwl0608 601ef2b715 Merge branch 'dev-lwl/order' into test 2024-05-15 19:58:18 +08:00
lwl0608 ce579b9701 add log 2024-05-15 19:57:52 +08:00
lwl0608 bc1163e806 Merge branch 'dev-lwl/order' into test 2024-05-15 19:12:38 +08:00
lwl0608 9b8b37d5e1 fix 2024-05-15 19:12:22 +08:00
Leufolium 757ca5edc6 Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf 2024-05-15 16:32:37 +08:00
Leufolium c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
Leufolium 0e6368fc0c by Robin at 20240515 2024-05-15 12:13:02 +08:00
Leufolium 7107bb0393 by Robin at 20240515 2024-05-15 09:58:45 +08:00
chenhao dbc5d4f9c4 Merge pull request 'feat-IRONFANS-117-Robin' (#438) from feat-IRONFANS-117-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/438
 2024-05-14 23:02:19 +08:00
Leufolium 211bd4ba79 by Robin at 20240514 2024-05-14 23:01:58 +08:00
Leufolium a523664f3a by Robin at 20240514 2024-05-14 22:58:12 +08:00
chenhao 75338ff450 Merge pull request 'by Robin at 20240514' (#436) from feat-IRONFANS-117-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/436
 2024-05-14 22:44:12 +08:00
Leufolium 7ab0b8ae82 by Robin at 20240514 2024-05-14 22:43:52 +08:00
Leufolium a94e614427 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into conflict 2024-05-14 22:34:15 +08:00
Leufolium 4077eb2380 by Robin at 20240514 2024-05-14 22:31:33 +08:00
chenhao 69a67c1221 Merge pull request 'main' (#431) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/431
 2024-05-14 20:36:36 +08:00
chenhao df70260ddc Merge pull request 'by Robin at 20240514' (#430) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/430
 2024-05-14 20:36:27 +08:00
Leufolium 1293757049 by Robin at 20240514 2024-05-14 20:36:01 +08:00
lwl0608 961f37af1b fix 2024-05-14 10:58:07 +08:00
lwl0608 4bf3a744b3 本周迭代 2024-05-14 10:55:49 +08:00
lwl0608 77bb52fe88 create_order 2024-05-14 09:52:23 +08:00
chenhao 36cc467854 Merge pull request 'feat-IRONFANS-117-Robin' (#428) from feat-IRONFANS-117-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/428
 2024-05-13 12:28:45 +08:00
Leufolium f6ee79f147 by Robin at 20240511 2024-05-11 19:29:33 +08:00
Leufolium 2c9e1cdb91 by Robin at 20240511 2024-05-11 10:22:32 +08:00
lwl0608 e7c977660d Merge branch 'dev-lwl/fix_witdraw' into test 2024-05-10 10:17:21 +08:00
lwl0608 6a7ff7a8ff add withdraw 2024-05-10 10:17:07 +08:00
chenhao 66ccd3aa64 Merge pull request 'by Robin at 20240509' (#420) from feat-IRONFANS-114-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/420
 2024-05-09 18:07:29 +08:00
Leufolium 06227bd983 by Robin at 20240509 2024-05-09 18:07:05 +08:00
Leufolium ec8e81a745 Merge remote-tracking branch 'origin/feat-IRONFANS-114-Robin' into conflict 2024-05-09 17:28:37 +08:00
Leufolium 67851d0dae by Robin at 20240509 2024-05-09 17:24:56 +08:00
Leufolium 56ceb91a45 Merge branch 'main' of http://121.41.31.146:3000/wishpal_ironfan/service 2024-05-09 01:19:15 +08:00
Leufolium 55c62a8fda by Robin at 20240509 2024-05-09 01:19:14 +08:00
chenhao 283704cd81 Merge pull request 'by Robin at 20240509' (#415) from BUG-RELATION-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/415
 2024-05-09 00:02:34 +08:00
Leufolium ed70c08149 by Robin at 20240509 2024-05-09 00:02:16 +08:00
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
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