Robin
|
12736a910f
|
Merge branch 'feat-IRONFANS-212-Robin' into conf-212
|
2024-12-24 14:48:44 +08:00 |
|
Robin
|
057badc5c1
|
by Robin at 20241224
|
2024-12-24 14:46:49 +08:00 |
|
Robin
|
5c0228b186
|
Merge branch 'feat-IRONFANS-212-Robin' into conf-212
|
2024-12-23 16:42:51 +08:00 |
|
Robin
|
7d6c85ad92
|
by Robin at 20241223
|
2024-12-23 16:40:11 +08:00 |
 lwl0608
|
4da76794e1
|
merge
|
2024-12-23 14:40:46 +08:00 |
|
lwl0608
|
b9c56a4213
|
opt_firenze
|
2024-12-23 14:40:07 +08:00 |
|
lwl0608
|
882da16813
|
Merge branch 'dev-lwl/app_levi' into test
|
2024-12-19 15:01:38 +08:00 |
|
lwl0608
|
af3db30c23
|
app_levi
|
2024-12-19 14:59:01 +08:00 |
|
lwl0608
|
3e14bb14e9
|
test aliapy whqm
|
2024-12-19 11:39:53 +08:00 |
|
lwl0608
|
20674e9435
|
Merge branch 'dev-lwl/alipay_add' into test
|
2024-12-19 11:39:04 +08:00 |
|
lwl0608
|
95976cfa84
|
whqm
|
2024-12-19 11:38:55 +08:00 |
 wangxinyu
|
ad95b3d324
|
Merge branch 'feature-pay_picture-wxy-20241216' into test
# Conflicts:
# app/mix/controller/init.go
# app/mix/service/apiservice.go
# app/mix/service/service.go
|
2024-12-18 14:40:42 +08:00 |
|
wangxinyu
|
7b47d92bf0
|
Merge remote-tracking branch 'origin/feature-pay_picture-wxy-20241216' into test
# Conflicts:
# dbstruct/account.go
|
2024-12-18 13:35:22 +08:00 |
|
wangxinyu
|
bd77e505fb
|
feat:会员付费看原图
|
2024-12-18 13:34:14 +08:00 |
 chenhao
|
36f8391ce5
|
Merge pull request 'feat-IRONFANS-212-Robin' (#910) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/910
|
2024-12-17 13:56:35 +08:00 |
|
Robin
|
91ec58186f
|
1
|
2024-12-17 13:51:55 +08:00 |
|
Robin
|
fefe5068ad
|
by Robin at 20241217
|
2024-12-17 13:32:48 +08:00 |
|
Robin
|
e19c44385d
|
Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063
|
2024-12-16 13:37:27 +08:00 |
|
wangxinyu
|
5a3ebbbb7c
|
feat: 会员看原图
|
2024-12-13 17:42:12 +08:00 |
|
chenhao
|
a985a5717d
|
Merge pull request 'feat-IRONFANS-212-Robin' (#892) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/892
|
2024-12-13 17:22:00 +08:00 |
|
Robin
|
3bab569aa5
|
by Robin at 20241213
|
2024-12-13 17:20:26 +08:00 |
|
lwl0608
|
7b099be1bf
|
add LOG
|
2024-12-13 16:43:14 +08:00 |
|
Robin
|
7bb9bb5c95
|
1
|
2024-12-13 15:59:08 +08:00 |
|
Robin
|
6211fab0b3
|
by Robin at 20241213
|
2024-12-13 15:48:23 +08:00 |
|
chenhao
|
e97e4b3e74
|
Merge pull request 'feat-IRONFANS-212-Robin' (#883) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/883
|
2024-12-11 18:23:53 +08:00 |
|
chenhao
|
beccc8b22f
|
Merge pull request 'main' (#881) from main into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/881
|
2024-12-11 18:21:17 +08:00 |
|
Robin
|
afd4108967
|
by Robin at 20241211
|
2024-12-11 18:16:16 +08:00 |
|
Robin
|
7ffa6ba385
|
by Robin at 20241211
|
2024-12-11 15:01:24 +08:00 |
|
Leufolium
|
18b474ac5f
|
by Robin at 20241210
|
2024-12-10 23:36:28 +08:00 |
|
lwl0608
|
2b884bd3fb
|
add multi online
|
2024-12-10 14:49:57 +08:00 |
|
lwl0608
|
d8f7045bff
|
x
|
2024-12-10 13:32:41 +08:00 |
|
lwl0608
|
87e344c636
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
# Conflicts:
# app/mix/dao/mongo.go
# app/mix/dao/mongo_vas.go
# dbstruct/vas_mongo.go
|
2024-12-09 16:20:13 +08:00 |
|
lwl0608
|
00c4baba5f
|
/withraw_sync_alipay
|
2024-12-09 16:08:19 +08:00 |
|
chenhao
|
00ddad4ff5
|
Merge pull request '1' (#870) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/870
|
2024-12-04 17:01:52 +08:00 |
|
Robin
|
b1f3ed40a9
|
1
|
2024-12-04 17:01:34 +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
|
d3a93f0fbc
|
Merge branch 'feat-IRONFANS-212-Robin' into test
|
2024-12-03 14:53:14 +08:00 |
|
Robin
|
495980a255
|
by Robin at 20241203
|
2024-12-03 14:52:07 +08:00 |
|
lwl0608
|
d5bfc13133
|
Merge branch 'dev-lwl/firenze' into test
|
2024-12-03 12:20:46 +08:00 |
|
lwl0608
|
fd87db0c61
|
fix
|
2024-12-03 12:20:34 +08:00 |
|
Robin
|
7d82065430
|
Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212
|
2024-11-26 16:31:36 +08:00 |
|
Robin
|
2a5cf59a19
|
1
|
2024-11-25 17:25:46 +08:00 |
|
Robin
|
34759baafc
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin
|
2024-11-25 17:12:59 +08:00 |
|
lwl0608
|
2e59c673b6
|
Merge branch 'dev-lwl/firenze' into test
|
2024-11-25 17:08:35 +08:00 |
|
lwl0608
|
f4380e6b52
|
firenze
|
2024-11-25 17:08:00 +08:00 |
|
Robin
|
fd0142a96a
|
Merge branch 'feat-IRONFANS-247-Robin' into conf-247
|
2024-11-25 15:24:18 +08:00 |
|
Robin
|
10c733b972
|
by Robin at 20241125; guild registration
|
2024-11-25 15:15:29 +08:00 |
|
chenhao
|
f74a126912
|
Merge pull request 'feat-IRONFANS-212-Robin' (#793) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/793
|
2024-11-12 17:38:29 +08:00 |
|
Leufolium
|
0870b550b8
|
by Robin at 20241112
|
2024-11-12 16:34:26 +08:00 |