Commit Graph

138 Commits

Author SHA1 Message Date
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