Commit Graph

233 Commits

Author SHA1 Message Date
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
Leufolium 3d0dbb6ca2 by Robin at 20240313; alter msg for permanent block 2024-03-13 16:31:51 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
Leufolium 43138ec16d by Robin at 20240308; moment recomm 2024-03-08 21:14:40 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
Leufolium 7dec418bfa by Robin at 20240308 2024-03-08 00:42:42 +08:00
lwl0608 3273330c76 refund 2024-03-07 19:39:33 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +08:00
Leufolium 2decbe9c67 by Robin at 20240227; register source statistics 2024-02-27 01:50:47 +08:00
Leufolium 14e8ae6cd7 by Robin at 20240227; 2024-02-27 01:28:27 +08:00
chenhao 5c164795f7 Merge pull request 'main' (#139) from main into feat-IRONFANS-56-Robin
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/139
2024-02-27 01:12:54 +08:00
Leufolium 6fb4fe002e by Robin at 20240226; 2024-02-26 08:03:37 +08:00
Leufolium 8cb0ab6819 by Robin at 20240223; fix 2024-02-23 16:04:54 +08:00
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 19de07fbe4 by Robin at 20240221; change moment audit logic 2024-02-21 18:04:01 +08:00
lwl0608 6952c1fbce fix 2024-02-19 21:13:18 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
lwl0608 632ce1228e SelectMinSizeOssId 2024-02-06 02:51:24 +08:00
Leufolium eeccbf6315 Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin 2024-02-05 21:26:22 +08:00
Leufolium 01092097c8 by Robin at 20240205 2024-02-05 21:18:27 +08:00
chenhao 4346b953d6 Merge pull request 'feat-IRONFANS-46-20240201-Robin' (#92) from feat-IRONFANS-46-20240201-Robin into main
Reviewed-on: #92
2024-02-04 17:01:34 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +08:00
Leufolium b3809eddf5 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-01 20:10:02 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
Leufolium f1ffbf473a by Robin at 20240201; 2024-02-01 09:02:11 +08:00
chenhao a1bae6eb21 Merge pull request 'by Robin at 20240116; fix' (#78) from feat-20230116-001-Robin into main
Reviewed-on: #78
2024-01-25 08:42:43 +08:00
Leufolium 68a75a8184 by Robin at 20240123; add consume his 2024-01-23 20:57:30 +08:00
Leufolium 48d1cb1b88 Merge remote-tracking branch 'origin/main' into feat-20240121-001-Robin 2024-01-23 19:12:27 +08:00
Leufolium 9eac3af283 by Robin at 20240123; return_url alteration 2024-01-23 19:08:59 +08:00
Leufolium e20f3c338c Merge branch 'feat-20240121-001-Robin' into conflict-feat-20240112-001-main 2024-01-23 18:01:39 +08:00
chenhao f724fed644 Merge pull request 'feat-20230112-001-Robin' (#67) from feat-20230112-001-Robin into main
Reviewed-on: #67
2024-01-23 17:56:14 +08:00
Leufolium f91231f5b3 by Robin at 20240112; fix 2024-01-22 15:13:52 +08:00
Leufolium 0839b0772a by Robin at 20240122; vas_user_membership_unlock 2024-01-22 14:32:43 +08:00
Leufolium 851e62264f by Robin at 20240122; fix 2024-01-22 14:21:13 +08:00
lwl0608 e3abdff08c opt 2024-01-21 12:27:34 +08:00
Leufolium a7c7d5f99e by Robin at 20240116; fix 2024-01-16 21:44:58 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
Leufolium 1f6a083f93 by Robin at 20240110; login add inviter field 2024-01-10 23:19:34 +08:00
lwl0608 ca0ed7bec9 apply time 2024-01-08 22:38:18 +08:00
lwl0608 7a55c52f0d add 2024-01-08 12:40:27 +08:00
lwl0608 537ed90d65 withdraw apply 2024-01-08 11:49:16 +08:00
lwl0608 ac91201240 add 2024-01-04 18:10:26 +08:00
chenhao bb8a2acd6a Merge pull request 'feat-20230102-001-Robin' (#41) from feat-20230102-001-Robin into main
Reviewed-on: #41
2024-01-04 13:09:50 +08:00
Leufolium 3cc042ba66 by Robin at 20230103; add daily statement 2024-01-03 16:16:41 +08:00
chenhao b1b4fed922 Merge pull request 'feat-20231228-001-Robin' (#36) from feat-20231228-001-Robin into main
Reviewed-on: #36
2024-01-02 22:41:44 +08:00
lwl0608 ea16e7788f fix 2024-01-01 12:23:40 +08:00
lwl0608 a4e9c589a3 优化 2024-01-01 12:19:48 +08:00
Leufolium b0d29a76db by Robin at 20231230; fix 2023-12-30 19:28:50 +08:00
lwl0608 6d4c1eb05a 优化 1 2023-12-30 13:49:05 +08:00
Leufolium 2e638c4f04 by Robin at 20231229; media fill 2023-12-29 22:22:25 +08:00
chenhao 64f506cab4 Merge pull request 'by Robin at 20231229; fix' (#17) from feat-20231228-004-Robin into main
Reviewed-on: #17
2023-12-29 14:47:30 +08:00
Leufolium 881316a60a by Robin at 20231229; fix 2023-12-29 14:22:26 +08:00
lwl0608 7d5758d999 alipay callback 2023-12-29 14:16:37 +08:00
Leufolium ac3b6c54b1 by Robin at 20231228; fix 2023-12-28 18:20:53 +08:00
Leufolium 4d560e5637 Merge branch 'main' of http://121.196.202.62:3000/wishpal_ironfan/service 2023-12-23 22:03:57 +08:00
Leufolium 7ea7b36776 by Robin at 20231223; contact session 2023-12-23 22:03:53 +08:00
lwl0608 9f62b24fff fix gold_num 2023-12-23 17:09:07 +08:00
lwl0608 9a00286db6 service 2023-12-21 22:17:40 +08:00