Commit Graph

545 Commits

Author SHA1 Message Date
JNG
e5362cb262 解决冲突 2026-01-12 14:39:24 +08:00
JNG
7798f19d2b 添加邀请人 2026-01-12 14:38:49 +08:00
71c3e61b65 自动调整ins图片大小 2026-01-09 13:59:56 +08:00
jiaji.H
a3d942135d Updata:解决冲突 2026-01-09 13:17:12 +08:00
jiaji.H
13b66debf3 Updata:解决冲突 2026-01-09 11:37:17 +08:00
jiaji.H
300a3eaebc Updata:增加youtube和bluesky账号导出 2026-01-09 11:32:54 +08:00
jiaji.H
1d136ceb8f Updata:修正精度丢失问题 2026-01-09 10:16:02 +08:00
93c085fb94 fix: 账号数量从3刷成5 2026-01-09 09:55:31 +08:00
jiaji.H
6dde482bb4 Updata:补充代码 2026-01-08 16:00:09 +08:00
jiaji.H
4f74232571 Updata:补充代码 2026-01-08 15:59:43 +08:00
jiaji.H
150452f067 Updata:作品确认时增加判断套餐是否过期 2026-01-08 15:57:29 +08:00
jiaji.H
db25e1bd36 Merge branch 'feat-hjj-healthCheck' 2026-01-06 14:04:47 +08:00
jiaji.H
a73f208810 Updata 2026-01-06 14:04:35 +08:00
jiaji.H
3dcaae2dca Updata 2026-01-06 14:00:45 +08:00
jiaji.H
c21c308be5 Updata:解决冲突 2026-01-06 13:52:57 +08:00
jiaji.H
2d182775ea Updata:增加健康检测接口 2026-01-06 13:49:23 +08:00
JNG
d3945f920c Merge branch 'jng' 2026-01-06 11:41:41 +08:00
jiaji.H
da7d185455 Updata:解决冲突 2026-01-06 10:14:13 +08:00
jiaji.H
bf4ccd87dd Updata:解决冲突 2026-01-05 11:47:07 +08:00
jiaji.H
b52190f021 Updata:补充导出数据字段 2026-01-05 11:46:02 +08:00
JNG
b9406c7f8a 解决冲突 2026-01-04 15:14:51 +08:00
JNG
4e9720e14d 添加邮箱和境外手机号 2026-01-04 15:13:45 +08:00
jiaji.H
2a38ed44b0 Updata:增加竞品数类型数据 2026-01-04 15:04:09 +08:00
5b6e72ee96 Merge branch 'feat-zjy-fixbug-022' into dev 2026-01-04 11:08:32 +08:00
fb77d2560f fix: 增值服务允许刷0 2026-01-04 11:06:33 +08:00
cjy
f88e745ab7 Merge branch 'feat-cjy-data'
# Conflicts:
#	api/aryshare/ayrshare.pb.go
#	api/aryshare/ayrshare.validator.pb.go
#	api/bundle/bundle.pb.go
#	api/bundle/bundle.validator.pb.go
#	api/bundle/bundle_triple.pb.go
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	api/cast/cast_triple.pb.go
#	pkg/cron/task.go
#	pkg/model/cast/work.go
2025-12-26 13:28:55 +08:00
e8fb81bfe9 fiee三期 2025-12-26 11:53:38 +08:00
JNG
6644880fc8 解决冲突 2025-12-26 11:47:07 +08:00
JNG
9219289db1 解决冲突 2025-12-26 11:44:06 +08:00
JNG
792a07057c Merge branch 'jng-contract-1225' into dev 2025-12-26 10:45:07 +08:00
JNG
c58fdff8e2 Update bundleOrder.go 2025-12-26 10:45:01 +08:00
JNG
f017aaa32e Merge branch 'jng-contract-1225' into dev 2025-12-26 10:40:51 +08:00
JNG
3aff9c3f87 Update bundleOrder.go 2025-12-26 10:40:42 +08:00
JNG
77c71b135d Merge branch 'jng-contract-1225' into dev 2025-12-26 10:25:20 +08:00
JNG
3bedf23d15 Update bundleOrder.go 2025-12-26 10:25:15 +08:00
JNG
2c0cc0a075 Merge branch 'jng-contract-1225' into dev 2025-12-26 10:21:09 +08:00
JNG
fda10744f1 Update bundleOrder.go 2025-12-26 10:21:04 +08:00
JNG
37e05c5e70 Merge branch 'jng-contract-1225' into dev 2025-12-26 09:53:18 +08:00
JNG
0c1a9374b4 修改 2025-12-26 09:53:04 +08:00
JNG
4494e80665 Merge branch 'jng-contract-1225' into dev 2025-12-25 20:22:31 +08:00
JNG
2e39896064 Update bundleOrder.go 2025-12-25 20:22:24 +08:00
JNG
4587bcb73c Merge branch 'jng-contract-1225' into dev 2025-12-25 20:17:53 +08:00
JNG
21322d0345 Update bundleOrder.go 2025-12-25 20:17:46 +08:00
JNG
b8258c611f Merge branch 'jng-contract-1225' into dev 2025-12-25 20:14:35 +08:00
JNG
07eb527d99 Update bundleOrder.go 2025-12-25 20:14:28 +08:00
JNG
384d67f56d Merge branch 'jng-contract-1225' into dev 2025-12-25 20:11:06 +08:00
JNG
ef8604530d Update signContractV2.go 2025-12-25 20:11:01 +08:00
JNG
1a4d3224a1 Merge branch 'jng-contract-1225' into dev 2025-12-25 19:51:26 +08:00
JNG
804fe0fd33 Update bundleOrder.go 2025-12-25 19:51:20 +08:00
JNG
5e17ed3890 Merge branch 'jng-contract-1225' into dev 2025-12-25 19:38:00 +08:00