Commit Graph

717 Commits

Author SHA1 Message Date
bx1834938347-prog
b981dcbede Merge branch 'wwq' into dev 2026-01-06 14:05:04 +08:00
bx1834938347-prog
4110717751 feat:修改pd文件 2026-01-06 14:04:57 +08:00
JNG
2e47045d31 Merge branch 'jng-supplier-0105' into dev 2026-01-06 11:28:31 +08:00
JNG
d464de6210 11 2026-01-06 11:25:20 +08:00
JNG
3ec3bf097b 解决冲突 2026-01-06 09:18:00 +08:00
JNG
a0f7998a13 11 2026-01-06 09:08:12 +08:00
cjy
ac46520b88 Merge branch 'feat-cjy-tag' into dev
# Conflicts:
#	api/cast/cast.pb.go
2026-01-05 16:40:29 +08:00
cjy
1505d88b25 feat: 增加重新统计引用数接口 2026-01-05 16:27:13 +08:00
jiaji.H
4b581cce83 Updata解决冲突 2026-01-05 10:47:28 +08:00
JNG
b9406c7f8a 解决冲突 2026-01-04 15:14:51 +08:00
JNG
4e9720e14d 添加邮箱和境外手机号 2026-01-04 15:13:45 +08:00
d1269f9ec1 修改DM授权账号分配 2026-01-04 14:10:38 +08:00
817c38dffa 修改DM授权账号分配 2026-01-04 14:09:26 +08:00
cjy
2cb1301cfa feat:实现对应话题标签相关接口 2025-12-31 14:07:01 +08:00
cjy
346c76f307 Merge branch 'feat-cjy-newTwoPlatform' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/service/cast/work.go
2025-12-29 13:55:39 +08:00
cjy
48b3a022eb 更新pb 2025-12-29 13:38:30 +08:00
9924e74633 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-29 11:45:19 +08:00
32413251a8 添加图片格式判断 2025-12-29 11:45:09 +08:00
cjy
f02fbb8cbe Merge branch 'main' into feat-cjy-newTwoPlatform
# Conflicts:
#	api/aryshare/ayrshare.pb.go
#	api/aryshare/ayrshare.validator.pb.go
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/service/cast/work.go
2025-12-29 11:38:03 +08:00
cjy
445a81e198 feat: 完成任务时,记录日志
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go
2025-12-28 13:12:42 +08:00
cjy
879b975ae5 feat: 完成任务时,记录日志 2025-12-28 13:09:54 +08:00
7d1aee048a Merge branch 'feature-userinfo-daiyb' into dev 2025-12-28 10:46:06 +08:00
99faf708cb 发布列表查询 2025-12-28 10:46:01 +08:00
bx1834938347-prog
123f70d4e2 feat:解决冲突 2025-12-26 15:02:11 +08:00
jiaji.H
6fdea5031e Updata:更新pb文件 2025-12-26 14:25:10 +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
9219289db1 解决冲突 2025-12-26 11:44:06 +08:00
JNG
943a3f58b7 解决冲突 2025-12-25 18:46:16 +08:00
JNG
f1372dfe5a 修改合同签署 2025-12-25 18:45:37 +08:00
cjy
6aac31847b Merge branch 'feat-cjy-data' into dev 2025-12-25 16:09:26 +08:00
cjy
33f4530d66 feat: 更新账号访问量计算方式 2025-12-25 16:09:03 +08:00
jiaji.H
885dac4abc Merge branch 'feat-hjj-ExportManager' 2025-12-25 15:58:14 +08:00
jiaji.H
6e64748577 Updata:解决冲突 2025-12-25 15:53:37 +08:00
jiaji.H
bd827102e0 Updata:增加导出表对应账号状态 2025-12-25 15:51:18 +08:00
cjy
5e42dd2b7c Merge branch 'feat-cjy-data' into dev 2025-12-24 16:46:29 +08:00
cjy
d695950af9 feat: 数据分析增加两个平台 2025-12-24 16:46:00 +08:00
ef11b30ad9 修改批量发布 2025-12-24 14:24:50 +08:00
beec2958f2 修改消费 2025-12-24 10:44:13 +08:00
aa4a6fb435 修改重新发布 2025-12-23 18:57:35 +08:00
cjy
1a460e4dac 更新pb 2025-12-23 10:52:21 +08:00
cjy
0e2c70e51e 更新 pb 2025-12-23 10:37:22 +08:00
cjy
dc286eb98f 更新pb 2025-12-23 10:23:14 +08:00
fe2d1fc250 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-23 09:54:09 +08:00
e98ab9e405 添加日志 2025-12-23 09:54:03 +08:00
af9568e527 Merge branch 'fix-uploadas-daiyb' into feature-userinfo-daiyb 2025-12-22 16:38:09 +08:00
bc42315df6 Merge branch 'fix-uploadas-daiyb' into dev 2025-12-22 15:47:30 +08:00
0cc5f79eec 修改重新发布 2025-12-22 15:47:25 +08:00
ab8e20f8f3 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-22 12:00:26 +08:00
09c8d7a03c 修改次数默认值 2025-12-22 12:00:21 +08:00