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

911 Commits

Author SHA1 Message Date
chenhao d069414106 Merge pull request 'by Robin at 20240501' (#403) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/403
 2024-05-01 05:26:33 +08:00
chenhao d09aca140d Merge pull request 'by Robin at 20240501' (#402) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/402
 2024-05-01 05:25:58 +08:00
Leufolium 1f394794ed by Robin at 20240501 2024-05-01 05:25:45 +08:00
chenhao 76a9e41413 Merge pull request 'by Robin at 20240501' (#401) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/401
 2024-05-01 05:12:04 +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
chenhao e7ade6e7cf Merge pull request 'by Robin at 20240501' (#399) from feat-IRONFANS-104-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/399
 2024-05-01 04:32:30 +08:00
Leufolium 7317ea2a65 by Robin at 20240501 2024-05-01 04:32:09 +08:00
chenhao 8e53a7ec84 Merge pull request 'feat-IRONFANS-70' (#397) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/397
 2024-05-01 04:09:53 +08:00
Leufolium d8527b01b1 BY 2024-05-01 04:09:27 +08:00
Leufolium 138a8da41d by RObin at 2024-05-01 04:01:58 +08:00
chenhao 83b4ed0320 Merge pull request 'by Robin at 20240501' (#396) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/396
 2024-05-01 03:53:15 +08:00
Leufolium 74e6f9a9f5 by Robin at 20240501 2024-05-01 03:52:59 +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 c82974fadf Merge remote-tracking branch 'origin/main' into conf 2024-05-01 03:27:04 +08:00
Leufolium 6824e26e90 by Robin at 20240501 2024-05-01 03:22:06 +08:00
Leufolium d494eb921b by Robin at 20240501 2024-05-01 02:51:47 +08:00
chenhao e2501b7022 Merge pull request 'by Robin at 20240501' (#390) from feat-IRONFANS-86-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/390
 2024-05-01 01:11:22 +08:00
Leufolium d642ca7dc0 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-05-01 01:11:00 +08:00
Leufolium 6158600853 by Robin at 20240501 2024-05-01 01:04:50 +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
Leufolium aa32674ed3 by Robin at 20240430 2024-04-30 09:40:19 +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 edbcabb372 Merge pull request 'feat-IRONFANS-86-Robin' (#384) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/384
 2024-04-29 22:37:25 +08:00
chenhao a3c29a0c6b Merge pull request 'feat-IRONFANS-86-Robin' (#383) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/383
 2024-04-29 22:37:06 +08:00
Leufolium 07aff915c0 b 2024-04-29 22:36:45 +08:00
chenhao c366a96735 Merge pull request 'by Robin at 20240429' (#381) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/381
 2024-04-29 22:32:32 +08:00
chenhao 9356387298 Merge pull request 'by Robin at 20240429' (#380) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/380
 2024-04-29 22:32:05 +08:00
Leufolium bd0fb55e8e by Robin at 20240429 2024-04-29 22:31:27 +08:00
chenhao bee0278f38 Merge pull request 'by Robin at 20240429' (#379) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/379
 2024-04-29 22:21:38 +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
Leufolium 86bc5933e4 by Robin at 20240429 2024-04-29 22:17:19 +08:00
lwl0608 0e8beef47b Merge branch 'dev-lwl/zone' into test 2024-04-29 17:53:01 +08:00
lwl0608 924656e8ed contact 2024-04-29 17:52:52 +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 9e4a6e744a Merge branch 'dev-lwl/zone' into test 2024-04-29 16:25:30 +08:00
lwl0608 f12a1ad2a2 fix coin order 2024-04-29 16:24:59 +08:00
lwl0608 f575f381e6 fix coin order 2024-04-29 16:23:03 +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 419e3fb0f3 Merge pull request 'feat-IRONFANS-87-Robin' (#372) from feat-IRONFANS-87-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/372
 2024-04-28 22:03:48 +08:00
chenhao e56dd98007 Merge pull request 'feat-IRONFANS-87-Robin' (#368) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/368
 2024-04-28 21:27:24 +08:00
Leufolium 442b84a0cd by Robin at 20240428 2024-04-28 21:26:59 +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
Leufolium 3ccfbf0e76 by Robin at 20240427 2024-04-27 17:23:04 +08:00
chenhao 007cef3d1a revert 7dd5e042ca 
revert by Robin at 20240427
 2024-04-27 17:22:02 +08:00
Leufolium 7dd5e042ca by Robin at 20240427 2024-04-27 17:19:46 +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
Leufolium acf047e66f Merge remote-tracking branch 'origin/main' into conflict 2024-04-27 08:24:56 +08:00
chenhao 1ef6478056 Merge pull request 'by Robin at 20240427' (#362) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/362
 2024-04-27 08:21:01 +08:00
Leufolium 14d86ae777 by Robin at 20240427 2024-04-27 08:20:19 +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 6376fc0d48 Merge pull request 'by Robin at 20240427' (#359) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/359
 2024-04-27 00:47:36 +08:00
Leufolium 2f4a80d3fc by Robin at 20240427 2024-04-27 00:47:18 +08:00
chenhao a008fa9e86 Merge pull request 'by Robin at 20240427' (#358) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/358
 2024-04-27 00:39:49 +08:00
Leufolium 9a5968f158 by Robin at 20240427 2024-04-27 00:39:28 +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
lwl0608 97e3d86078 fix refund 2024-04-26 21:10:52 +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
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
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 4137710945 by Robin at 20240426 2024-04-26 11:13:49 +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
lwl0608 30f4a9dd37 fix membership change 2024-04-26 02:27:07 +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
lwl0608 0f96f44c3e fix 2024-04-26 01:13:35 +08:00
lwl0608 e4d97122a1 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 19:20:07 +08:00
lwl0608 b47afa4909 fix 2024-04-25 19:19:22 +08:00
chenhao 5bc35d7cb6 Merge pull request 'feat-IRONFANS-70' (#344) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/344
 2024-04-25 18:45:09 +08:00
chenhao b75e80c928 Merge pull request 'by Robin at 20240425' (#343) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/343
 2024-04-25 18:44:57 +08:00
Leufolium 5fd92b9716 by Robin at 20240425 2024-04-25 18:44:35 +08:00
lwl0608 063e134f85 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 18:43:54 +08:00
lwl0608 6a6781e9d8 fix income stype 2024-04-25 18:43:38 +08:00
chenhao 0762fbac7d Merge pull request 'feat-IRONFANS-70' (#342) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/342
 2024-04-25 18:32:07 +08:00
chenhao b038ef5896 Merge pull request 'by Robin at 20240425' (#341) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/341
 2024-04-25 18:31:52 +08:00
Leufolium 4ffcf0a6a6 by Robin at 20240425 2024-04-25 18:31:34 +08:00
chenhao 68b723302a Merge pull request 'feat-IRONFANS-70' (#340) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/340
 2024-04-25 18:27:18 +08:00
chenhao cd7eb88088 Merge pull request 'by Robin at 20240425' (#339) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/339
 2024-04-25 18:27:08 +08:00
Leufolium 50599bbe49 by Robin at 20240425 2024-04-25 18:25:52 +08:00
chenhao 9f49851303 Merge pull request 'feat-IRONFANS-70' (#338) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/338
 2024-04-25 18:11:48 +08:00
chenhao 1692ee7360 Merge pull request 'by Robin at 20240425' (#337) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/337
 2024-04-25 18:11:37 +08:00
Leufolium a83558e581 by Robin at 20240425 2024-04-25 18:11:16 +08:00
chenhao de3a28ef12 Merge pull request 'feat-IRONFANS-70' (#336) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/336
 2024-04-25 17:53:47 +08:00
chenhao f7ae3aa297 Merge pull request 'by Robin at 20240425' (#335) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/335
 2024-04-25 17:53:35 +08:00
Leufolium 7a9f955262 by Robin at 20240425 2024-04-25 17:53:14 +08:00
lwl0608 77659e7a42 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 17:49:01 +08:00
lwl0608 6dca251071 fix income stype 2024-04-25 17:48:52 +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
lwl0608 eb91dd804b Merge branch 'feat-IRONFANS-70' into test 2024-04-25 16:45:03 +08:00
lwl0608 88b4c917c6 fix calc 2024-04-25 16:44:50 +08:00
chenhao bf783ceb8b Merge pull request 'feat-IRONFANS-70' (#332) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/332
 2024-04-25 16:41:12 +08:00
chenhao 0d6b0bce10 Merge pull request 'by Robin at 20240425' (#331) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/331
 2024-04-25 16:41:01 +08:00
Leufolium 197fb8e87e by Robin at 20240425 2024-04-25 16:40:21 +08:00
lwl0608 85d20b02a9 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:28:32 +08:00
lwl0608 7e5c721c97 fix 2024-04-25 15:28:25 +08:00
lwl0608 ff3e66eca6 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:17:30 +08:00
lwl0608 8950b008e6 add log 2024-04-25 15:16:59 +08:00
lwl0608 4439f43169 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:12:35 +08:00
lwl0608 01e4bfcd8c fix refund_status 2024-04-25 15:12:22 +08:00
lwl0608 0f75a2f27e Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:41:46 +08:00
lwl0608 a64b404298 fix 2024-04-25 14:41:36 +08:00
lwl0608 67c1a7ef0e Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:37:12 +08:00
lwl0608 4fb56ba1cc add 2024-04-25 14:36:53 +08:00
lwl0608 6b3b18f31a Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:07:56 +08:00
lwl0608 f3533490f8 add 2024-04-25 14:07:46 +08:00
lwl0608 a41f626be5 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 10:06:42 +08:00
lwl0608 25410368f5 order 2024-04-25 10:06:28 +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 8323f3917a Merge branch 'feat-IRONFANS-70' into test 2024-04-24 22:35:17 +08:00
lwl0608 cd840f36e4 refund 2024-04-24 22:35:00 +08:00
lwl0608 fa07d9ec5e Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:42:38 +08:00
lwl0608 49c31aa9ce fix 2024-04-24 21:42:31 +08:00
lwl0608 4862d2d7a1 Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:39:54 +08:00
lwl0608 c355c74390 fix 2024-04-24 21:39:47 +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 3ae3423683 Merge branch 'feat-IRONFANS-70' into test 2024-04-24 19:37:34 +08:00
lwl0608 f4dd7158e1 add incomlist log 2024-04-24 19:36:01 +08:00
lwl0608 b62ead3be5 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 19:08:54 +08:00
lwl0608 6e83930c9e fix 2024-04-23 19:08:45 +08:00
chenhao 34fa0c622f Merge pull request 'feat-IRONFANS-70' (#326) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/326
 2024-04-23 18:32:24 +08:00
chenhao d48d695310 Merge pull request 'by Robin at 20240422' (#325) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/325
 2024-04-23 18:32:13 +08:00
Leufolium 1966a42d28 by Robin at 20240422 2024-04-23 18:30:28 +08:00
lwl0608 58c2692eb8 fix coin order 2024-04-23 17:39:42 +08:00
lwl0608 829fc08066 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:32:45 +08:00
lwl0608 2860992cba fix in error 2024-04-23 17:32:29 +08:00
lwl0608 bb558dc638 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:29:36 +08:00
lwl0608 561afa8755 fix tx 2024-04-23 17:29:27 +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
lwl0608 3b3d47eef6 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:12:51 +08:00
lwl0608 f901feadf7 fix chaofen song weixin 2024-04-23 17:12:41 +08:00
lwl0608 89ad155d56 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:02:08 +08:00
lwl0608 8e52f92b0b add 2024-04-23 17:01:59 +08:00
lwl0608 52dba2b052 Merge branch 'feat-IRONFANS-70' into test 2024-04-22 22:09:29 +08:00
lwl0608 9600ec1b29 fix 2024-04-22 22:09:22 +08:00
lwl0608 a56b8bdaa3 Merge branch 'feat-IRONFANS-70' into test 2024-04-22 21:20:26 +08:00
lwl0608 ca924bf81a fix 2024-04-22 21:20:17 +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
chenhao bfc84392aa Merge pull request 'feat-IRONFANS-70' (#320) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/320
 2024-04-22 19:37:08 +08:00
chenhao 484a4a5fa1 Merge pull request 'by Robin at 20240422' (#319) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/319
 2024-04-22 19:36:53 +08:00
Leufolium 475132987d by Robin at 20240422 2024-04-22 19:36:30 +08:00
chenhao 7067c143de Merge pull request 'by Robin at 20240422' (#318) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/318
 2024-04-22 19:21:32 +08:00
Leufolium 312c078216 by Robin at 20240422 2024-04-22 19:21:14 +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 7696327333 Merge pull request 'feat-IRONFANS-70' (#315) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/315
 2024-04-22 18:34:16 +08:00
chenhao d074023584 Merge pull request 'by Robin at 20240422' (#314) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/314
 2024-04-22 18:34:06 +08:00
Leufolium bf1de24bcd by Robin at 20240422 2024-04-22 18:33:40 +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 0df6e2b2fc Merge pull request 'feat-IRONFANS-70' (#309) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/309
 2024-04-22 07:18:47 +08:00
chenhao 78b363183b Merge pull request 'by Robin at 20240422' (#308) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/308
 2024-04-22 07:18:38 +08:00
Leufolium f2c9c5a7f6 by Robin at 20240422 2024-04-22 07:18:23 +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 511b5a331c Merge branch 'feat-IRONFANS-70' into test 2024-04-19 23:59:40 +08:00
lwl0608 cd62e4b4c7 fix zid 2024-04-19 23:59:31 +08:00
lwl0608 8a4693e7fe fix zid 2024-04-19 23:58:42 +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 88b06ca599 Merge branch 'feat-IRONFANS-70' into test 2024-04-19 10:11:26 +08:00
lwl0608 23b4d166ec 增加逻辑 2024-04-19 10:11:14 +08:00
lwl0608 f4f3f7482b Merge branch 'feat-IRONFANS-70' into test 2024-04-18 23:00:07 +08:00
lwl0608 780fb7ab32 fix 2024-04-18 22:59:56 +08:00
lwl0608 b2c89fb357 fix 2024-04-18 22:59:32 +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 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
lwl0608 d6217c6f39 vas 2024-04-18 19:26:52 +08:00
chenhao cb592d0113 Merge pull request 'feat-IRONFANS-70' (#305) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/305
 2024-04-18 17:43:42 +08:00
chenhao 953fb01d89 Merge pull request 'by Robin at 20240418' (#304) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/304
 2024-04-18 17:43:32 +08:00
Leufolium 460153a394 by Robin at 20240418 2024-04-18 17:43:12 +08:00
chenhao c300e789ab Merge pull request 'feat-IRONFANS-70' (#303) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/303
 2024-04-18 17:18:44 +08:00
chenhao 4a4005da91 Merge pull request 'by Robin at 20240418' (#302) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/302
 2024-04-18 17:18:34 +08:00
Leufolium a1093d383e by Robin at 20240418 2024-04-18 17:17:58 +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
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
Leufolium 13fb262b82 by Robin at 20240417 2024-04-17 23:39:37 +08:00
lwl0608 d4192b06ce Merge branch 'feat-IRONFANS-70' into test 2024-04-16 22:14:49 +08:00
lwl0608 f5e7265d23 fix checkwlt 2024-04-16 22:14:40 +08:00
lwl0608 bc72a80687 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 22:09:28 +08:00
lwl0608 d731659a50 fix 2024-04-16 22:09:15 +08:00
lwl0608 5467be4a52 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 21:57:44 +08:00
lwl0608 89bc85b415 fix 2024-04-16 21:57:34 +08:00
lwl0608 6ed2b69550 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 21:54:46 +08:00
lwl0608 e03489feba fix 2024-04-16 21:54:31 +08:00
lwl0608 c3247fcf66 fix checkwallet 2024-04-16 21:49:18 +08:00
lwl0608 563e007d92 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 21:13:39 +08:00
lwl0608 03fdc98f3d 修复 2024-04-16 21:13:26 +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
chenhao 0d2fab9ed1 Merge pull request 'feat-IRONFANS-70' (#297) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/297
 2024-04-16 19:48:40 +08:00
chenhao 559f6c1aff Merge pull request 'by Robin at 20240416' (#296) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/296
 2024-04-16 19:48:29 +08:00
Leufolium 50ef95271c by Robin at 20240416 2024-04-16 19:48:15 +08:00
lwl0608 b497fe8cf3 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 19:40:09 +08:00
lwl0608 2177fdadbb zv fix 2024-04-16 19:39:51 +08:00
lwl0608 d473564666 Merge branch 'feat-IRONFANS-70' into test 2024-04-16 19:19:15 +08:00
lwl0608 a3555962d8 fix 2024-04-16 19:19:06 +08:00
chenhao b753c6a9e3 Merge pull request 'feat-IRONFANS-70' (#293) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/293
 2024-04-16 19:06:32 +08:00
Leufolium 7b24d98dd5 By Robin at 20240416 2024-04-16 19:01:33 +08:00
Leufolium 4fe9faa1bb by Robin at 20240416 2024-04-16 18:59:32 +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