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

768 Commits

Author SHA1 Message Date
lwl0608 faba1b1f96 替换新apollo 2024-03-25 20:00:02 +08:00
chenhao 7c490e1a50 Merge pull request 'by Robin at 20240325; nil' (#202) from BUG-20240322-0001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/202
 2024-03-25 19:37:25 +08:00
Leufolium 7b2d360274 by Robin at 20240325; nil 2024-03-25 19:37:01 +08:00
chenhao 83927db1f3 Merge pull request 'by Robin at 20240325; alter xxl-job' (#201) from BUG-20240322-0001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/201
 2024-03-25 13:23:23 +08:00
Leufolium a4332f706a by Robin at 20240325; alter xxl-job 2024-03-25 13:23:04 +08:00
chenhao bf2605738c Merge pull request 'by Robin at 20240325; fix bug' (#200) from BUG-20240322-0001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/200
 2024-03-25 12:27:53 +08:00
Leufolium 7df6e1862c by Robin at 20240325; fix bug 2024-03-25 12:27:37 +08:00
chenhao 7af89f7d42 Merge pull request 'mainconflict' (#199) from mainconflict into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/199
 2024-03-25 12:14:21 +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
lwl0608 7bb527c1dc fix panic 2024-03-25 11:25:37 +08:00
chenhao a934f070d7 Merge pull request 'by Robin at 20240322; -fans' (#196) from feat-IRONFANS-58-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/196
 2024-03-22 14:08:44 +08:00
Leufolium dacc31cb31 by Robin at 20240322; -fans 2024-03-22 14:08:30 +08:00
chenhao c9c66aba94 Merge pull request 'mainconflict' (#195) from mainconflict into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/195
 2024-03-22 13:56:21 +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 53086cde6c fix recover 2024-03-21 20:27:42 +08:00
lwl0608 f5cc4e4891 fix recovery 2024-03-21 20:22:10 +08:00
lwl0608 ad95c1be67 recover 2024-03-21 20:18:22 +08:00
lwl0608 6f16b754ce fix panic 2024-03-21 20:10:30 +08:00
lwl0608 59d9638bef fix 2024-03-21 20:06:27 +08:00
lwl0608 1cd3e685e3 fix 退款理由 2024-03-21 20:03:31 +08:00
lwl0608 1255e0f916 fix 退款理由 2024-03-21 19:54:20 +08:00
lwl0608 f1728bb5a3 fix err return 2024-03-21 19:25:54 +08:00
lwl0608 27e50ded04 fix err return 2024-03-21 19:18:50 +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
lwl0608 b263f04fd1 fix 2024-03-20 18:57:05 +08:00
lwl0608 2511bf9e1f 优化 2024-03-20 18:51:16 +08:00
Leufolium a364553c0c by Robin at 20240320 2024-03-20 10:06:26 +08:00
Leufolium 7c09356ce9 excel 2024-03-20 09:48:37 +08:00
lwl0608 acd49e99a2 fix 2024-03-19 17:41:51 +08:00
lwl0608 9bd1c77f4a fix 2024-03-19 16:34:02 +08:00
lwl0608 31a7247337 优化 2024-03-19 16:21:53 +08:00
lwl0608 d2e0a24bb3 fix productid 2024-03-19 16:09:51 +08:00
lwl0608 fca64cbb67 refund coin order 2024-03-19 16:04:36 +08:00
lwl0608 05fbd7e04e 充值明细 优化 2024-03-19 10:30:25 +08:00
lwl0608 184a3ff5e2 明细 时间倒序 2024-03-19 10:20:50 +08:00
chenhao d92fe95c31 Merge pull request '1' (#193) from mainconflict into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/193
 2024-03-19 00:05:36 +08:00
Leufolium 3d09829521 1 2024-03-19 00:05:23 +08:00
chenhao ff6023a7f1 Merge pull request 'mainconflict' (#192) from mainconflict into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/192
 2024-03-19 00:02:17 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
chenhao 0dba8132b0 Merge pull request '1' (#190) from feat-IRONFANS-66-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/190
 2024-03-18 23:52:22 +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 d2f961a2d4 1 2024-03-18 23:51:31 +08:00
chenhao 6518d37c1f Merge pull request 'feat-IRONFANS-66-Robin' (#188) from feat-IRONFANS-66-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/188
 2024-03-18 23:43:13 +08:00
Leufolium ec2bad2abf by 2024-03-18 23:36:53 +08:00
Leufolium 2b5396d96b by robin at 20240318; alter text for punishing 2024-03-18 23:34:49 +08:00
chenhao c7ced3c1a4 Merge pull request 'BUG-20240316-0001-Robin' (#187) from BUG-20240316-0001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/187
 2024-03-17 00:42:52 +08:00