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

244 Commits

Author SHA1 Message Date
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
Leufolium c89082aea9 by Robin at 20240411 2024-04-11 19:34:51 +08:00
chenhao 9d53f252ce Merge pull request 'feat-IRONFANS-70' (#266) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/266
 2024-04-11 18:34:05 +08:00
Leufolium acfe24623f by Robin at 20240411 2024-04-11 18:33:38 +08:00
chenhao 3ece8f7504 Merge pull request 'feat-IRONFANS-70' (#260) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/260
 2024-04-11 17:59:45 +08:00
Leufolium 31903d0ed0 by Robin at 20240411 2024-04-11 17:58:33 +08:00
chenhao 381cd689ba Merge pull request 'feat-IRONFANS-70' (#258) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/258
 2024-04-11 16:53:04 +08:00
Leufolium 0dd9eb1360 by Robin at 20240411 2024-04-11 16:52:30 +08:00
chenhao 25b311a326 Merge pull request 'feat-IRONFANS-70' (#254) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/254
 2024-04-11 16:08:33 +08:00
Leufolium 1c5a9bbdc5 by Robin at 20240411 2024-04-11 16:08:05 +08:00
chenhao 6b2cef4112 Merge pull request 'feat-IRONFANS-70' (#252) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/252
 2024-04-11 15:55:40 +08:00
Leufolium b7e5eda22d by Robin at 20240411 2024-04-11 15:55:14 +08:00
chenhao 711aaa3d03 Merge pull request 'feat-IRONFANS-70' (#250) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/250
 2024-04-11 15:46:38 +08:00
Leufolium 0975288b86 by Robin at 20240411 2024-04-11 15:46:01 +08:00
chenhao b565383703 Merge pull request 'feat-IRONFANS-70' (#244) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/244
 2024-04-11 14:04:53 +08:00
Leufolium 5b292b346a by Robin at 20240411 2024-04-11 14:03:40 +08:00
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +08:00
chenhao 580e55829a Merge pull request 'feat-IRONFANS-70' (#240) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/240
 2024-04-09 19:19:51 +08:00
Leufolium f96a04614a by Robin at 20240409 2024-04-09 19:19:16 +08:00
Leufolium e985e15ae1 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf 2024-04-08 20:14:44 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 5a333382ff Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf 2024-04-05 17:11:18 +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 be27160261 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict 2024-04-03 16:55:08 +08:00
Leufolium 1650066959 by Robin at 20240403 2024-04-03 06:28:55 +08:00
Leufolium ed5d905eb7 by Robin at 20240403 2024-04-03 06:04:50 +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
chenhao 77a336bfa8 Merge pull request 'feat-IRONFANS-76-Robin' (#222) from feat-IRONFANS-76-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/222
 2024-03-29 23:19:33 +08:00
chenhao 266c9818f3 Merge pull request 'by Robin at 20240329' (#221) from feat-IRONFANS-76-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/221
 2024-03-29 23:08:24 +08:00
Leufolium cd7a9275aa by Robin at 20240329 2024-03-29 23:07:36 +08:00
chenhao 4066114141 Merge pull request 'by Robin at 20240329' (#220) from feat-IRONFANS-76-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/220
 2024-03-29 22:56:36 +08:00
Leufolium 8cc83fc70c by Robin at 20240329 2024-03-29 22:55:58 +08:00
Leufolium f435a98c08 Merge branch 'feat-IRONFANS-76-Robin' into conflict 2024-03-29 14:06:28 +08:00
Leufolium f08bd346c9 by Robin at 20240329 2024-03-29 14:03:59 +08:00
Leufolium 12549d2de5 by Robin at 20240329; alter moment audit procedure 2024-03-29 00:16:42 +08:00
chenhao 114939f340 Merge pull request 'by Robin at 20240328' (#217) from feat-IRONFANS-ALTER-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/217
 2024-03-28 13:00:25 +08:00
Leufolium df9defb44f by Robin at 20240328 2024-03-28 13:00:07 +08:00
Leufolium 315d467f30 by Robin at 20240328 2024-03-28 12:22:48 +08:00
Leufolium 113cf31495 Merge remote-tracking branch 'origin/main' into test 2024-03-28 12:12:05 +08:00
Leufolium 1bd0784227 by Robin at 20240327; 2024-03-27 20:50:40 +08:00
Leufolium fd1706dd51 by Robin at 20240327; op list deleted 2024-03-27 20:29:22 +08:00
Leufolium 8dcd0562e4 by Robin at 20240326; alter streamer recomm 2024-03-26 18:11:38 +08:00
Leufolium 1ab2b556a1 Merge branch 'BUG-20240322-0001-Robin' into mainconflict 2024-03-25 12:13:49 +08:00
Leufolium 294bea59e4 By Robin at 20240325; fix bug 2024-03-25 12:11:29 +08:00
Leufolium 5344a54888 Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict 2024-03-22 13:54:11 +08:00
Leufolium 407292fe8d by Robin at 20240321 2024-03-21 23:26:23 +08:00
lwl0608 bbcfcb3b95 fix recover 2024-03-21 20:31:12 +08:00
lwl0608 66f90c6b45 op order list 2024-03-21 16:05:11 +08:00
lwl0608 6d73c70cf7 op order list 2024-03-21 16:02:41 +08:00
Leufolium a364553c0c by Robin at 20240320 2024-03-20 10:06:26 +08:00
lwl0608 acd49e99a2 fix 2024-03-19 17:41:51 +08:00
lwl0608 fca64cbb67 refund coin order 2024-03-19 16:04:36 +08:00
lwl0608 184a3ff5e2 明细 时间倒序 2024-03-19 10:20:50 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
chenhao 6bda0929d9 Merge pull request 'feat-IRONFANS-66-Robin' (#189) from feat-IRONFANS-66-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/189
 2024-03-18 23:51:52 +08:00
Leufolium 67e27e04db Merge branch 'BUG-20240316-0001-Robin' into conflict 2024-03-16 22:36:05 +08:00
Leufolium 89c8c5565b by Robin at 20240316; alter account search expr 2024-03-16 22:33:58 +08:00
Leufolium 1954e80ab3 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-14 07:55:43 +08:00
Leufolium a2f70a63d9 by Robin at 20240314; add newly-created moment 2024-03-14 07:53:25 +08:00
lwl0608 779e47996e Merge branch 'dev-lwl/refund' 2024-03-13 20:35:32 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
chenhao 5881859273 Merge pull request 'by Robin at 20240222; fix' (#174) from feat-IRONFANS-54-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/174
 2024-03-12 23:49:14 +08:00
Leufolium f990dd0be0 Merge branch 'feat-IRONFANS-66-Robin' into conflict 2024-03-12 12:10:16 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
Leufolium 4cf49ad204 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 21:21:20 +08:00
Leufolium 43138ec16d by Robin at 20240308; moment recomm 2024-03-08 21:14:40 +08:00
chenhao 2c7ffb40c9 Merge pull request 'by Robin at 20240308; add bottom flag' (#165) from feat-IRONFANS-58-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/165
 2024-03-08 15:15:49 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
chenhao 74c6061db0 Merge pull request 'by Robin at 20240308; logout' (#164) from feat-IRONFANS-62-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/164
 2024-03-08 12:52:59 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00
Leufolium 960adc1455 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 01:30:30 +08:00
Leufolium 9692680528 by 2024-03-08 00:59:20 +08:00