Commit Graph

110 Commits

Author SHA1 Message Date
JNG
25d37da088 解决冲突 2026-01-12 14:38:06 +08:00
jiaji.H
8b6f5da73b Updata:解决冲突 2026-01-12 13:40:37 +08:00
jiaji.H
c4ec01846f Updata:调整余量更新定时任务至客户端 2026-01-12 13:28:47 +08:00
jiaji.H
7ac61c197c Updata:解决冲突 2026-01-09 13:16:28 +08:00
jiaji.H
fbd3c97547 Updata:解决冲突 2026-01-05 10:45:33 +08:00
JNG
f228f73ef3 解决冲突 2026-01-04 15:13:08 +08:00
JNG
d730106309 添加自媒体账号选择 2026-01-04 15:11:45 +08:00
jiaji.H
2a75b9b6db Updata:套餐与余量增加竞品数字段与对应功能 2026-01-04 11:12:34 +08:00
cjy
b8dfc8a6e6 Merge branch 'feat-cjy-taskLog' into dev
# Conflicts:
#	internal/logic/bundleExtendLogic.go
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle_triple.pb.go
#	pkg/msg/msg.go
2025-12-28 12:56:46 +08:00
cjy
0bf1f34bba feat: 增加日志创建 2025-12-28 11:40:57 +08:00
jiaji.H
0e64d40489 Updata:增加套餐类型字段 2025-12-26 14:24:05 +08:00
JNG
d11a7a5c6a 解决冲突 2025-12-26 11:43:26 +08:00
JNG
bfffc58e16 解决冲突 2025-12-25 18:45:09 +08:00
JNG
fa640ed8ef 修改合同签署 2025-12-25 18:44:43 +08:00
jiaji.H
bb5a8a9547 Updata:增加获取待确认列表 2025-12-16 16:01:30 +08:00
jiaji.H
e08bdb3937 Updata:更新增加获取 2025-12-16 15:59:45 +08:00
jiaji.H
57e9499b6b Updata:解决冲突 2025-12-09 13:27:37 +08:00
jiaji.H
0182a49efd Updata:更新套餐购买表导出 2025-12-09 13:25:33 +08:00
JNG
d2613d7f91 解决冲突 2025-12-09 11:10:14 +08:00
JNG
1b2e5f8fd1 11 2025-12-09 11:07:16 +08:00
cjy
0bef1ca389 Merge branch 'feat-cjy-taskBench'
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-12-01 10:22:47 +08:00
cjy
e8129eed10 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-12-01 10:05:45 +08:00
cjy
18530c60cd feat: 增加一个接口 2025-11-29 17:00:57 +08:00
cjy
3e14262cf4 Merge branch 'feat-cjy-taskBench'
# Conflicts:
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle_triple.pb.go
2025-11-28 16:03:59 +08:00
cjy
3627b64ca5 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-11-28 15:20:33 +08:00
cjy
79a11cc943 feat: 增加隐藏最近指派人功能 2025-11-28 13:44:01 +08:00
cjy
9d43d9b652 Merge branch 'feat-cjy-taskBench'
# Conflicts:
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle.validator.pb.go
#	pb/bundle/bundle_triple.pb.go
2025-11-27 15:21:14 +08:00
cjy
73171ea314 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-11-25 16:18:38 +08:00
cjy
2f212ec7e8 feat: 增加任务回退,删除同步恢复数量 2025-11-25 16:17:36 +08:00
cjy
3796eea44d Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-11-18 14:09:33 +08:00
cjy
c0fdc635b6 feat: 批量查询艺人待上传套餐和增值视频、图文、数据分析数 2025-11-18 13:15:44 +08:00
cjy
1916c843d4 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	internal/dao/taskDao.go
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle.validator.pb.go
#	pb/bundle/bundle_triple.pb.go
2025-11-17 14:55:24 +08:00
cjy
5110a04bd0 feat: 增加待发任务列表的布局接口 2025-11-17 14:43:59 +08:00
cjy
74b0947052 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	internal/dao/taskDao.go
#	pb/bundle/bundle.pb.go
2025-11-17 11:32:56 +08:00
jiaji.H
80ca1c30a5 Updata:解决冲突 2025-11-14 23:56:41 +08:00
cjy
44591aafbe Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-11-14 14:41:55 +08:00
cjy
871a4beb4b feat: 添加批量中止任务接口 2025-11-14 13:58:57 +08:00
cjy
bdc4e11420 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	internal/dao/taskDao.go
#	internal/model/task.go
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle_triple.pb.go
2025-11-14 10:18:34 +08:00
cjy
c1502994ff feat: 增加艺人待上传列表接口 2025-11-13 11:38:52 +08:00
cjy
f124e6c008 feat: 增加一个接口,根据任务uuid查询任务实际完成状态。同时当任务已实际完成时,不允许中止。 2025-11-12 09:07:47 +08:00
cjy
31d98fee28 feat: 添加中止任务接口 2025-11-11 16:13:46 +08:00
cjy
193ce39906 bugfix: 更新 pb文件,以及根据任务批次查询是,只能精准查询,不用模糊查询 2025-11-11 15:04:11 +08:00
cjy
c4f67fd739 feat: 批量指派时,添加指派视频脚本数 2025-11-11 14:37:01 +08:00
cjy
94389edf24 feat: 任务指派记录添加任务批次、脚本数字段,添加批量指派功能 2025-11-11 13:20:30 +08:00
jiaji.H
8d55cde7f5 Updata:更新注释 2025-11-07 10:37:01 +08:00
lzh
68fdc6d374 youtube类型换成dm 2025-11-06 14:54:33 +08:00
jiaji.H
3c4887ca64 Updata:解决冲突 2025-11-06 10:04:46 +08:00
lzh
1c4208688a 新增当月使用字段 2025-10-28 11:05:15 +08:00
JNG
7698b7bfad 解决冲突 2025-10-27 13:09:08 +08:00
jiaji.H
697a27498e Updata:解决冲突 2025-10-27 12:01:11 +08:00