Commit Graph

562 Commits

Author SHA1 Message Date
cjy
82fd06139a Merge branch 'feat-cjy-report' into dev 2026-01-26 15:01:09 +08:00
cjy
c0ea800511 fix: 修复套餐过期导致的错误 2026-01-26 15:01:01 +08:00
cjy
cebf10a3e6 Merge branch 'feat-cjy-report' into dev 2026-01-26 09:25:01 +08:00
cjy
cccee7f86e fix:修复逻辑 2026-01-26 09:24:35 +08:00
cjy
1277e0da8d Merge branch 'feat-cjy-report' into dev 2026-01-23 17:00:12 +08:00
cjy
adf3b5ee89 fix: 竞品报告需要扣减余额,以及修改错误提示语 2026-01-23 16:59:44 +08:00
cjy
9bd8e67116 Merge branch 'feat-cjy-report' into dev
# Conflicts:
#	pkg/model/cast/work.go
2026-01-14 17:43:51 +08:00
jiaji.H
8d36aeb751 Updata:解决冲突 2026-01-14 13:42:58 +08:00
jiaji.H
5d3c21624c Updata:更新视频上传数据导出 2026-01-13 16:43:17 +08:00
jiaji.H
efe79ec250 Updata:解决冲突 2026-01-13 16:40:05 +08:00
jiaji.H
0fd6319e34 Updata:更新导出 2026-01-13 16:12:32 +08:00
jiaji.H
1886935f4d Updata:更新导出 2026-01-13 16:00:32 +08:00
jiaji.H
dca004ecc6 Updata:解决冲突 2026-01-13 14:17:54 +08:00
jiaji.H
b121c12f7c Updata:增加支持多月份导出 2026-01-13 14:09:55 +08:00
jiaji.H
3d67be4e09 Updata:解决冲突 2026-01-13 09:39:13 +08:00
jiaji.H
e75e6b7ce9 Updata:增加竞品数pb 2026-01-13 09:36:01 +08:00
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
daad39d53c Updata:更新表格样式 2026-01-05 11:51:20 +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