wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,949 Commits 94 Branches 0 Tags 43 MiB
Commit Graph

420 Commits

Author SHA1 Message Date
chenhao a614e015a4 Merge pull request 'feat-IRONFANS-147-Robin' (#529) from feat-IRONFANS-147-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/529
 2024-06-13 12:32:16 +08:00
Leufolium b45bddf849 by Robin at 20240613 2024-06-13 12:29:14 +08:00
chenhao 624a521ad1 Merge pull request 'by Robin at 20240607; refund rate' (#526) from feat-IRONFANS-144-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/526
 2024-06-07 16:45:39 +08:00
Leufolium 4a57f04cf4 by Robin at 20240607; refund rate 2024-06-07 16:45:01 +08:00
chenhao 9358a749c7 Merge pull request 'feat-IRONFANS-58-Robin' (#524) from feat-IRONFANS-58-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/524
 2024-06-04 17:17:15 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
chenhao 52219a36c5 Merge pull request 'feat-IRONFANS-58-Robin' (#516) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/516
 2024-05-30 14:56:13 +08:00
Leufolium d9d60f69a6 by Robin at 20240529 2024-05-29 10:48:29 +08:00
chenhao 2ff7822af8 Merge pull request 'feat-IRONFANS-133-Robin' (#510) from feat-IRONFANS-133-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/510
 2024-05-27 16:28:00 +08:00
chenhao 72067fa808 Merge pull request 'main' (#509) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/509
 2024-05-25 19:03:36 +08:00
Leufolium c8f9f00a13 by Robin at 20240525 2024-05-25 18:20:49 +08:00
chenhao 1ac088da88 Merge pull request 'main' (#506) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/506
 2024-05-25 13:15:16 +08:00
Leufolium 6c3fea0d1c by Robin at 20240525 2024-05-25 13:14:10 +08:00
Leufolium c44f8d3cab Merge remote-tracking branch 'origin/main' into test 2024-05-25 01:17:29 +08:00
Leufolium 39d95f6ba8 by Robin at 20240524 2024-05-24 23:27:51 +08:00
Leufolium e141dc412c By Robin at 20240524 2024-05-24 23:27:05 +08:00
chenhao e0a7a1bb23 Merge pull request 'feat-IRONFANS-134-Robin' (#499) from feat-IRONFANS-134-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/499
 2024-05-24 22:43:54 +08:00
Leufolium 0d6a991101 by Robin at 20240524 2024-05-24 22:43:39 +08:00
Leufolium cddc6fe29a Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-23 04:12:37 +08:00
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
Leufolium ab80a78cc7 by 2024-05-21 23:22:05 +08:00
Leufolium 5cd103dac2 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin-2' into conf 2024-05-21 23:15:47 +08:00
chenhao 36338ff2e8 by Robin at 20240521 2024-05-21 23:11:45 +08:00
Leufolium 7c76dc449c by robin at 20240521 2024-05-21 23:06:30 +08:00
lwl0608 e84f94de68 fix log 2024-05-21 19:57:46 +08:00
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +08:00
chenhao 3bbbeee0ab Merge pull request 'by Robin at 20240517' (#453) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/453
 2024-05-17 18:58:13 +08:00
Leufolium f0198e6e71 by Robin at 20240517 2024-05-17 18:57:41 +08:00
Leufolium d089f30fb4 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into release-20240517 2024-05-17 16:17:46 +08:00
Leufolium f7c25ae1cc Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into release-20240517 2024-05-17 16:12:41 +08:00
chenhao f8775c6d17 Merge pull request 'feat-IRONFANS-112-Robin' (#448) from feat-IRONFANS-112-Robin into release-20240517 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/448
 2024-05-17 16:10:50 +08:00
lwl0608 16713c569f Merge branch 'dev-lwl/order' 2024-05-17 14:08:57 +08:00
lwl0608 930e39e500 Merge branch 'dev-lwl/consul' into test 2024-05-17 10:44:54 +08:00
lwl0608 71f4a1e200 fix log 2024-05-16 22:26:06 +08:00
Leufolium 54732df0d4 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin' into conf 2024-05-16 18:17:14 +08:00
Leufolium 3d607a52a9 by Robin at 20240516 2024-05-16 16:31:55 +08:00
chenhao 8e144dfd7a Merge pull request 'by Robin at 20240516' (#445) from feat-IRONFANS-120-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/445
 2024-05-16 16:00:44 +08:00
Leufolium 0c3bb46562 by Robin at 20240516 2024-05-16 16:00:20 +08:00
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
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