wishpal_ironfan
/
service
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,223 Commits 73 Branches 0 Tags 30 MiB
Commit Graph

361 Commits

Author SHA1 Message Date
lwl0608 f34bf3670e yop 2024-05-27 16:48:25 +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
Leufolium b8a9b7e66b by Robin at 20240524 2024-05-24 04:09:24 +08:00
Leufolium c2c8125b5f by 2024-05-24 03:52:57 +08:00
chenhao 31ac9a3b98 revert 4f67673057 
revert by Robin at 20240524
 2024-05-24 03:32:04 +08:00
Leufolium 4f67673057 by Robin at 20240524 2024-05-24 03:18:12 +08:00
Leufolium 63ba534b6e by Robin at 20240523 2024-05-23 04:10:10 +08:00
Leufolium a7e01c4dec by Robin at 20240522 2024-05-22 23:20:27 +08:00
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
Leufolium 5247912764 by 2024-05-21 23:31:10 +08:00
Leufolium b8b228eb02 by Robin at 20240521 2024-05-21 23:12:25 +08:00
chenhao 36338ff2e8 by Robin at 20240521 2024-05-21 23:11:45 +08:00
chenhao 3ff0b4ed87 by Robin at 20240516 2024-05-21 23:06:48 +08:00
Leufolium 7c76dc449c by robin at 20240521 2024-05-21 23:06:30 +08:00
Leufolium 1d2d8b1cc5 by Robin at 20240521 2024-05-21 22:12:59 +08:00
chenhao 568d7661f7 Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
 2024-05-18 00:34:39 +08:00
Leufolium 6ff619e386 1 2024-05-18 00:34:20 +08:00
chenhao 73be110ca6 Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
 2024-05-18 00:13:38 +08:00
Leufolium 853d231a9f by Robin at 20240518 2024-05-18 00:12:54 +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
Leufolium 3a3c50f851 by Robin at 20240516 2024-05-16 14:40:22 +08:00
Leufolium 0d6097d174 by Robin at 20240516 2024-05-16 14:07:27 +08:00
Leufolium c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
Leufolium 07b587475b by Robin at 20240515 2024-05-15 16:29:59 +08:00
Leufolium 5016e7b7be by Robin at 20240515 2024-05-15 16:07:33 +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
Leufolium 4077eb2380 by Robin at 20240514 2024-05-14 22:31:33 +08:00
Leufolium 3dc9ca1665 by Robin at 20240514 2024-05-14 17:22:40 +08:00
lwl0608 4bf3a744b3 本周迭代 2024-05-14 10:55:49 +08:00
Leufolium f6ee79f147 by Robin at 20240511 2024-05-11 19:29:33 +08:00
Leufolium f7f6535cc0 by Robin at 20240511 2024-05-11 18:22:17 +08:00
lwl0608 22b28535a8 w 2024-05-11 00:04:06 +08:00
lwl0608 95ef64760d isWithdrawAnyDiasEnable 2024-05-10 23:51:35 +08:00
lwl0608 6a7ff7a8ff add withdraw 2024-05-10 10:17:07 +08:00
Leufolium 67851d0dae by Robin at 20240509 2024-05-09 17:24:56 +08:00
Leufolium 0614fd84e2 by Robin at 20240508 2024-05-08 22:55:15 +08:00
Leufolium 7b385f395d by Robin at 20240507; set is_hided for zone third partner 2024-05-07 16:59:10 +08:00
lwl0608 5aab80fcdd add media op 2024-05-07 10:50:40 +08:00
lwl0608 2a5192c4e1 fix vip config 2024-05-06 20:17:52 +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
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
Leufolium d8527b01b1 BY 2024-05-01 04:09:27 +08:00
Leufolium 74e6f9a9f5 by Robin at 20240501 2024-05-01 03:52:59 +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 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
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 924656e8ed contact 2024-04-29 17:52:52 +08:00
lwl0608 715ff91c51 zone_refund_list 2024-04-29 17:39:49 +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
Leufolium 217a53d6b2 by Robin at 20240428 2024-04-28 21:33:24 +08:00
lwl0608 8db2ce1071 fix 2024-04-28 17:59:57 +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 e8ddb5bb9e by Robin at 20240427 2024-04-27 19:49:56 +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
Leufolium b53a96d3bf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin 2024-04-27 08:27:34 +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
Leufolium 2ac68c47c7 by Robin at 20240426 2024-04-26 14:54:27 +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 0630bd9a18 by Robin at 20240426 2024-04-26 10:46:37 +08:00
lwl0608 60dd9b28c5 add wxpay callback manul 2024-04-26 01:29:36 +08:00
chenhao ccf590ebe2 Merge pull request 'by Robin at 20240425' (#347) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/347
 2024-04-25 20:18:38 +08:00
Leufolium eac26caaf7 by Robin at 20240425 2024-04-25 20:18:23 +08:00
chenhao dbcf924eda Merge pull request 'by Robin at 20240425' (#345) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/345
 2024-04-25 20:16:15 +08:00
Leufolium 0429bbdf57 by Robin at 20240425 2024-04-25 20:15:48 +08:00
lwl0608 a64b404298 fix 2024-04-25 14:41:36 +08:00
lwl0608 f3533490f8 add 2024-04-25 14:07:46 +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 327a38177f fix 2024-04-24 22:24:51 +08:00
Leufolium 1966a42d28 by Robin at 20240422 2024-04-23 18:30:28 +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 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 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 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 0178df0ff0 Merge pull request 'by Robin at 20240422' (#310) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/310
 2024-04-22 07:21:29 +08:00
Leufolium d762f5df3a by Robin at 20240422 2024-04-22 07:21:16 +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 b2c89fb357 fix 2024-04-18 22:59:32 +08:00
lwl0608 e7ba504413 优化 2024-04-18 20:27:18 +08:00
lwl0608 d6217c6f39 vas 2024-04-18 19:26:52 +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 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 03fdc98f3d 修复 2024-04-16 21:13:26 +08:00
lwl0608 5dedd4fd27 fix db 2024-04-16 20:20:53 +08:00
Leufolium 50ef95271c by Robin at 20240416 2024-04-16 19:48:15 +08:00
Leufolium 5cd1cbf027 by Robin at 20240416 2024-04-16 19:10:04 +08:00
lwl0608 9fdbd5bcb2 add 2024-04-16 10:49:02 +08:00
lwl0608 5c01857d28 add 2024-04-16 09:51:39 +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 c1a2237479 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#286) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/286
 2024-04-12 23:07:12 +08:00
Leufolium e986f9ba07 by Robin at 20240412 2024-04-12 23:02:55 +08:00
chenhao 4e99c4fe82 Merge pull request 'b' (#284) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/284
 2024-04-12 06:46:07 +08:00
Leufolium 156cc92de9 b 2024-04-12 06:45:51 +08:00
Leufolium 648a860a83 Merge branch 'dev-feat-IRONFANS-70-Robin' into conflict-feat-IRONFANS-70 2024-04-12 06:43:00 +08:00
Leufolium 52624ac592 by Robin at 20240411 2024-04-12 06:40:30 +08:00
chenhao c420f41c05 Merge pull request 'by Robin at 20240411' (#277) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/277
 2024-04-11 21:57:03 +08:00
Leufolium 1ecae673f6 by Robin at 20240411 2024-04-11 21:56:48 +08:00
chenhao 127c289735 Merge pull request 'by Robin at 20240411' (#267) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/267
 2024-04-11 19:35:10 +08:00
Leufolium c89082aea9 by Robin at 20240411 2024-04-11 19:34:51 +08:00
chenhao 1301c0a9ec Merge pull request 'by Robin at 20240411' (#265) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/265
 2024-04-11 18:33:56 +08:00
Leufolium acfe24623f by Robin at 20240411 2024-04-11 18:33:38 +08:00
chenhao 469c7f8775 Merge pull request 'by Robin at 20240411' (#263) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/263
 2024-04-11 18:19:55 +08:00
Leufolium 776e50f148 by Robin at 20240411 2024-04-11 18:19:34 +08:00
lwl0608 8f24732eb4 udpate proto 2024-04-11 17:57:01 +08:00
lwl0608 aff4682096 fix proto 2024-04-11 17:51:41 +08:00
lwl0608 1aa8641cd2 protos 2024-04-11 17:47:24 +08:00
Leufolium 0dd9eb1360 by Robin at 20240411 2024-04-11 16:52:30 +08:00
Leufolium 76f35eaced b 2024-04-11 16:15:46 +08:00
Leufolium 0975288b86 by Robin at 20240411 2024-04-11 15:46:01 +08:00
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +08:00
Leufolium f96a04614a by Robin at 20240409 2024-04-09 19:19:16 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 8b3d7a96cb by Robin at 20240404 2024-04-04 21:25:13 +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 cd19d49538 by Robin at 20240403 2024-04-03 16:45:30 +08:00
Leufolium 6a043dbbb7 by Robin at 20240403 2024-04-03 06:19:11 +08:00
Leufolium 50f7e16608 by Robin at 20240403 2024-04-03 04:56:21 +08:00
Leufolium ea6eea1ccf by Robin at 20240403 2024-04-03 00:25:14 +08:00
Leufolium 15bb43afdf by Robin at 20240402 2024-04-02 22:47:41 +08:00
Leufolium a31e57c806 by Robin at 20240402 2024-04-02 18:53:26 +08:00
Leufolium a69bcdb6a2 Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin 2024-04-01 11:19:10 +08:00
Leufolium dc65d4f32e Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-04-01 11:18:03 +08:00
Leufolium 8cc83fc70c by Robin at 20240329 2024-03-29 22:55:58 +08:00
Leufolium 12549d2de5 by Robin at 20240329; alter moment audit procedure 2024-03-29 00:16:42 +08:00