 wangxinyu
|
550f72f71a
|
Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test
# Conflicts:
# dbstruct/account.go
|
2024-12-11 16:49:59 +08:00 |
|
wangxinyu
|
9c4394fb34
|
feat: 主播昵称过人审
|
2024-12-11 16:44:38 +08:00 |
|
wangxinyu
|
7f86bc7d9f
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 10:47:27 +08:00 |
|
wangxinyu
|
7a2969236f
|
fix: consts
|
2024-12-09 10:46:42 +08:00 |
|
wangxinyu
|
4e4b603a43
|
fix: 参数校验和日志
|
2024-12-09 10:44:20 +08:00 |
 chenhao
|
b9de1a1f58
|
Merge pull request 'by Robin at 20241204' (#869) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/869
|
2024-12-04 16:56:16 +08:00 |
Robin
|
b9f7164a33
|
by Robin at 20241204
|
2024-12-04 16:55:33 +08:00 |
|
Robin
|
8d1229aa79
|
Merge branch 'feat-IRONFANS-212-Robin' into conf-212
|
2024-12-02 16:02:53 +08:00 |
|
Robin
|
b408f1ff16
|
by Robin at 20241129
|
2024-11-29 17:30:12 +08:00 |
|
Robin
|
1ff5c87a88
|
Merge branch 'feat-IRONFANS-212-Robin-Rebase' into feat-IRONFANS-212-Robin-Rebase2
|
2024-11-28 16:26:37 +08:00 |
|
Robin
|
131f55d8bf
|
Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212
|
2024-11-27 16:25:19 +08:00 |
|
Robin
|
7be56f9775
|
by Robin at 20241127
|
2024-11-27 15:31:48 +08:00 |
|
Robin
|
dd96ceb00c
|
Merge branch 'feat-IRONFANS-248-Robin' into conf-248
|
2024-11-26 16:16:32 +08:00 |
|
Robin
|
340e6f400f
|
by Robin at 20241126
|
2024-11-26 15:02:20 +08:00 |
|
Robin
|
34759baafc
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin
|
2024-11-25 17:12:59 +08:00 |
|
Leufolium
|
e014d2b80a
|
Merge branch 'feat-IRONFANS-235-Robin' into test
|
2024-11-18 17:00:49 +08:00 |
|
Leufolium
|
c72afa8b57
|
1
|
2024-11-18 16:56:44 +08:00 |
|
Leufolium
|
f6a60004fe
|
Merge branch 'feat-IRONFANS-235-Robin' into conf-235
|
2024-11-18 16:21:46 +08:00 |
|
Leufolium
|
5a88ba39ae
|
1
|
2024-11-18 16:18:38 +08:00 |
|
Leufolium
|
761499bef5
|
Merge branch 'feat-IRONFANS-235-Robin' into conf-235
|
2024-11-18 15:18:49 +08:00 |
|
Leufolium
|
98cf6b3f4b
|
by Robin at 20241118
|
2024-11-18 15:16:10 +08:00 |
|
Leufolium
|
b5f5a81915
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin
|
2024-11-11 15:17:31 +08:00 |
|
Leufolium
|
e1bd39e683
|
Merge branch 'feat-IRONFANS-212-Robin' into conf-212
|
2024-11-07 18:56:23 +08:00 |
|
Leufolium
|
9b830999aa
|
by Robin at 20241107
|
2024-11-07 17:05:13 +08:00 |
|
Leufolium
|
0277f51c12
|
Merge remote-tracking branch 'origin/main' into mtest 1
|
2024-11-01 16:28:07 +08:00 |
|
Leufolium
|
1abe2c1cfb
|
by Robin at 20241101
|
2024-11-01 16:09:59 +08:00 |
|
Leufolium
|
5bad31df47
|
Merge branch 'feat-IRONFANS-212-Robin' into conf-IRONFANS-212
|
2024-10-29 14:59:50 +08:00 |
|
Leufolium
|
8fdac4d4f2
|
by Robin at 20241029
|
2024-10-29 14:57:22 +08:00 |
|
Leufolium
|
50df41672d
|
Merge branch 'feat-IRONFANS-210-Robin' into release-20241017
|
2024-10-17 20:24:15 +08:00 |
|
Leufolium
|
1940ea3524
|
Merge branch 'feat-IRONFANS-218-Robin' into confsms
|
2024-09-25 13:25:04 +08:00 |
|
Leufolium
|
b1e531ce6f
|
by Robin at 20240925
|
2024-09-25 13:13:35 +08:00 |
|
chenhao
|
6b91c35199
|
Merge pull request 'feat-IRONFANS-212-Robin' (#734) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/734
|
2024-09-12 15:51:32 +08:00 |
|
Leufolium
|
cdb1f9a24a
|
by Robin at 20240912
|
2024-09-12 11:54:16 +08:00 |
|
Leufolium
|
715428a777
|
Merge branch 'feat-IRONFANS-212-Robin' into tconflict
|
2024-09-02 13:03:26 +08:00 |
|
Leufolium
|
19cccc907f
|
by Robin at 20240902
|
2024-09-02 12:52:49 +08:00 |
|
Leufolium
|
288fa990c5
|
Merge branch 'feat-IRONFANS-210-Robin' into conflict
|
2024-08-23 16:20:39 +08:00 |
|
Leufolium
|
8bb1042d17
|
by Robin at 20240823
|
2024-08-23 16:17:32 +08:00 |
|
Leufolium
|
d4cff8cc01
|
by Robin at 20240816
|
2024-08-16 06:14:55 +08:00 |
|
Leufolium
|
98f605c265
|
Merge branch 'feat-IRONFANS-176-Robin' into mainconf
|
2024-08-01 22:34:08 +08:00 |
|
Leufolium
|
2793aff71d
|
Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict
|
2024-07-31 22:14:57 +08:00 |
|
Leufolium
|
d9ef34138b
|
1
|
2024-07-30 15:35:27 +08:00 |
|
Leufolium
|
8fcef422bb
|
by Robin at 20240729
|
2024-07-29 15:48:39 +08:00 |
|
Leufolium
|
8eec2ba0ee
|
by Robin at 20240725
|
2024-07-25 21:35:25 +08:00 |
|
Leufolium
|
b283c34f44
|
by Robin at 20240722
|
2024-07-22 09:17:49 +08:00 |
|
Leufolium
|
2167befc4d
|
1
|
2024-07-19 18:31:15 +08:00 |
|
Leufolium
|
de756dab19
|
1
|
2024-07-19 17:46:58 +08:00 |
|
Leufolium
|
813636ca8f
|
by Robin at 20240624
|
2024-06-24 19:14:31 +08:00 |
|
Leufolium
|
6159759111
|
by Robin at 20240617
|
2024-06-17 22:25:43 +08:00 |
|
Leufolium
|
a6e3a3ee12
|
by Robin at 20240530
|
2024-05-30 15:23:40 +08:00 |
|
Leufolium
|
b8a9b7e66b
|
by Robin at 20240524
|
2024-05-24 04:09:24 +08:00 |