Commit Graph

109 Commits

Author SHA1 Message Date
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 7934476912 修复 2024-04-16 21:24:28 +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 3940762760 by Robin at 20240416 2024-04-16 19:04:34 +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
lwl0608 91a3bd5371 add 2024-04-12 10:01:56 +08:00
chenhao 9b7fb15547 Merge pull request 'by Robin at 20240411' (#275) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/275
2024-04-11 21:52:36 +08:00
Leufolium b4e04b8841 by Robin at 20240411 2024-04-11 21:51:46 +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 cc7745ee62 Merge pull request 'by Robin at 20240411' (#259) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/259
2024-04-11 17:59:03 +08:00
Leufolium 31903d0ed0 by Robin at 20240411 2024-04-11 17:58:33 +08:00
lwl0608 1aa8641cd2 protos 2024-04-11 17:47:24 +08:00
Leufolium 1c5a9bbdc5 by Robin at 20240411 2024-04-11 16:08:05 +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 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 4820bd9503 by Robin at 20240404 2024-04-04 20:48:42 +08:00
Leufolium 77b664bbea by Robin at 20240403 2024-04-03 21:53:46 +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 5582a324b3 Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin 2024-04-02 18:55:38 +08:00
Leufolium a8726adf79 by Robin at 20240402 2024-04-02 18:55:05 +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 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
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 2511bf9e1f 优化 2024-03-20 18:51:16 +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 05fbd7e04e 充值明细 优化 2024-03-19 10:30:25 +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 2b5396d96b by robin at 20240318; alter text for punishing 2024-03-18 23:34:49 +08:00
Leufolium 776f52c177 加json字段 2024-03-17 00:42:26 +08:00
Leufolium 89c8c5565b by Robin at 20240316; alter account search expr 2024-03-16 22:33:58 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00