Commit Graph

233 Commits

Author SHA1 Message Date
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
edc85ae53e 解决冲突 2025-12-26 11:42:47 +08:00
JNG
bfffc58e16 解决冲突 2025-12-25 18:45:09 +08:00
JNG
fa640ed8ef 修改合同签署 2025-12-25 18:44:43 +08:00
jiaji.H
24980bd23f Updata:解决冲突 2025-12-25 16:27:26 +08:00
jiaji.H
a526c9e837 Updata:解决冲突 2025-12-25 15:52:51 +08:00
jiaji.H
296e6a3eff Updata:更新pb文件 2025-12-25 15:51:38 +08:00
jiaji.H
28b6e6a514 Updata:解决冲突 2025-12-25 15:40:27 +08:00
jiaji.H
31093ace3f Updata:更新导出艺人账号字段 2025-12-25 15:39:41 +08:00
jiaji.H
512c3683ef Updata:解决冲突 2025-12-18 17:26:22 +08:00
jiaji.H
da925cc342 Updata:增加套餐状态 2025-12-18 17:24:56 +08:00
jiaji.H
c5e9c42ffd Updata:更新逻辑 2025-12-17 16:24:02 +08:00
jiaji.H
387293b15a Updata:解决冲突 2025-12-17 16:17:25 +08:00
jiaji.H
c5b63de30a Updata:更新sql 2025-12-17 16:16:41 +08:00
jiaji.H
78faedd3d5 Updata:解决冲突 2025-12-17 13:24:54 +08:00
jiaji.H
7d686338e0 Updata:解决冲突 2025-12-17 13:21:24 +08:00
jiaji.H
7d758b1b89 Updata:解决冲突 2025-12-17 10:59:44 +08:00
jiaji.H
065ac39c05 Updata:增加字段 2025-12-17 10:58:36 +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
a80da48ed0 Updata:解决冲突 2025-12-16 14:42:14 +08:00
jiaji.H
a0f54358b7 Updata:增加数据分析数据指标相关信息 2025-12-16 14:40:25 +08:00
jiaji.H
6b61b43464 Updata:增加重发数据过滤 2025-12-16 09:29:15 +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
4152832b11 Merge branch 'feat-cjy-taskBench'
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-11-29 13:05:10 +08:00
cjy
2d0adbedcc Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-11-29 11:02:25 +08:00
cjy
83a30d6958 feat: 新增可指派字段 2025-11-28 17:46:41 +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
88799b6773 feat: 最近指派人多返回一个手机号 2025-11-28 15:11:37 +08:00
cjy
79a11cc943 feat: 增加隐藏最近指派人功能 2025-11-28 13:44:01 +08:00
jiaji.H
e4fd9b48ec Merge branch 'feat-hjj-CastWork#' 2025-11-27 18:10:55 +08:00
jiaji.H
93fc705a53 Merge branch 'feat-hjj-CastWork#' into dev 2025-11-27 17:52:34 +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
jiaji.H
cb9556329d Updata:更新统计数量对应状态 2025-11-26 16:45:50 +08:00
cjy
8738732b1d Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2025-11-26 16:26:46 +08:00
cjy
d92c45efe0 feat: 增加分页 2025-11-26 16:21:08 +08:00