|
|
ad78d51967
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 18:55:15 +08:00 |
|
|
|
fb77431848
|
Update bundle_order_records.go
|
2025-12-25 18:55:08 +08:00 |
|
|
|
bfffc58e16
|
解决冲突
|
2025-12-25 18:45:09 +08:00 |
|
|
|
fa640ed8ef
|
修改合同签署
|
2025-12-25 18:44:43 +08:00 |
|
|
|
bfaac2fd95
|
fix： 修复统计视频和图文以及数据分析统计
|
2025-12-25 16:51:36 +08:00 |
|
jiaji.H
|
e6bb72da9f
|
Updata：解决冲突
|
2025-12-25 16:44:40 +08:00 |
|
jiaji.H
|
5dd3eb98c4
|
Updata：修改判断
|
2025-12-25 16:43:57 +08:00 |
|
jiaji.H
|
24980bd23f
|
Updata:解决冲突
|
2025-12-25 16:27:26 +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
|
71e0b4e323
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-24 12:30:25 +08:00 |
|
jiaji.H
|
5e428f6acc
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev
|
2025-12-24 12:02:10 +08:00 |
|
jiaji.H
|
2c9cf80f6c
|
Updata更新检测sql
|
2025-12-24 12:01:55 +08:00 |
|
jiaji.H
|
41c534d7d5
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev
|
2025-12-24 11:54:29 +08:00 |
|
jiaji.H
|
1d871c909b
|
Updata：增加log
|
2025-12-24 11:54:19 +08:00 |
|
jiaji.H
|
e4f7529c0c
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-19 13:55:59 +08:00 |
|
jiaji.H
|
d85409c1c8
|
Updata：修改成根据待确认时间来判断
|
2025-12-19 13:55:42 +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
|
850df59ab0
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-18 15:15:13 +08:00 |
|
jiaji.H
|
97ac650055
|
Updata：更新获取数据条件
|
2025-12-18 15:15:01 +08:00 |
|
jiaji.H
|
8127a14106
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-18 14:29:07 +08:00 |
|
jiaji.H
|
f12da7b70a
|
Updata：更新随机确认时间
|
2025-12-18 14:28:30 +08:00 |
|
jiaji.H
|
d4cacd0996
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-18 10:36:50 +08:00 |
|
jiaji.H
|
55dbf93c73
|
Updata：回退至正常时间
|
2025-12-18 10:36:38 +08:00 |
|
jiaji.H
|
c4e8d33c6d
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-18 10:22:30 +08:00 |
|
jiaji.H
|
69ac59610a
|
Updata：调整检查时间和数量
|
2025-12-18 10:22:09 +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
|
8801a2c551
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-17 14:04:09 +08:00 |
|
jiaji.H
|
f1850a68d7
|
Updata:调整数据选择
|
2025-12-17 14:03:52 +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
|
ccda7aab75
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev
|
2025-12-17 09:06:12 +08:00 |
|
jiaji.H
|
2804ffd294
|
Updata：更新只拿取24小时内的数据
|
2025-12-17 09:03:54 +08:00 |
|
jiaji.H
|
0ad0b78e0a
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev
|
2025-12-16 16:02:53 +08:00 |
|
jiaji.H
|
b345333255
|
Updata：补充代码
|
2025-12-16 16:02:38 +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
|
3361be0a62
|
Updata：解决冲突
|
2025-12-12 14:13:53 +08:00 |
|
jiaji.H
|
5da3d20cd9
|
Updata：更新过滤软删除
|
2025-12-12 14:12:39 +08:00 |
|
|
|
716948d4ea
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-12-10 15:39:36 +08:00 |
|
|
|
28f5055895
|
fix: 更新计算逻辑
|
2025-12-10 15:39:27 +08:00 |
|
|
|
5384c0902a
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-12-10 14:57:47 +08:00 |
|
|
|
69ba9ccc08
|
fix: 更新计算待上传数量的逻辑
|
2025-12-10 14:57:19 +08:00 |
|
jiaji.H
|
d2366f16fb
|
Updata：增加错误返回
|
2025-12-10 11:50:56 +08:00 |
|
jiaji.H
|
005377ed00
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-12-10 10:18:15 +08:00 |
|
jiaji.H
|
457dbc5186
|
Updata：更新确认列表数据状态
|
2025-12-10 10:18:04 +08:00 |
|
jiaji.H
|
d94a81c7e5
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-12-09 14:35:35 +08:00 |
|
jiaji.H
|
1c4464b54f
|
Updata：修正字段类型
|
2025-12-09 14:35:27 +08:00 |
|
jiaji.H
|
ebda28849e
|
Updata：修正字段类型
|
2025-12-09 14:34:47 +08:00 |
|
jiaji.H
|
1ce637e827
|
Updata：解决冲突
|
2025-12-09 14:26:56 +08:00 |
|
jiaji.H
|
c2a3edc65e
|
Updata：解决冲突
|
2025-12-09 14:25:03 +08:00 |
|
jiaji.H
|
b7b0cef4e3
|
Updata：增加注释
|
2025-12-09 14:15:30 +08:00 |
|
jiaji.H
|
5d0a31f58f
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-12-09 14:12:42 +08:00 |
|
jiaji.H
|
1d9880ec16
|
Updata：修正sql查询
|
2025-12-09 14:12:30 +08:00 |
|
jiaji.H
|
8cc2a14942
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-12-09 14:05:30 +08:00 |
|
jiaji.H
|
7988edba7e
|
Updata：更新sql
|
2025-12-09 14:05:17 +08:00 |
|
jiaji.H
|
d62cae1c41
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-12-09 13:53:56 +08:00 |
|
jiaji.H
|
5a682ce51a
|
Updata：更新sql
|
2025-12-09 13:53:43 +08:00 |
|
jiaji.H
|
f04e350e6b
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-12-09 13:49:25 +08:00 |
|
jiaji.H
|
878a9c94f4
|
Updata：更新sql
|
2025-12-09 13:49:12 +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 |
|
|
|
d2613d7f91
|
解决冲突
|
2025-12-09 11:10:14 +08:00 |
|
|
|
1b2e5f8fd1
|
11
|
2025-12-09 11:07:16 +08:00 |
|
jiaji.H
|
c748bb87e6
|
Merge branch 'feat-hjj-CastWork#'
|
2025-12-01 16:15:06 +08:00 |
|
jiaji.H
|
06ad2e6894
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-12-01 16:12:42 +08:00 |
|
jiaji.H
|
a341967a94
|
Updata:更新定时任务逻辑
|
2025-12-01 16:12:11 +08:00 |
|
|
|
0aeda33f32
|
fix: 修复视频脚本测试与正式环境时区不一致的问题
|
2025-12-01 10:43:09 +08:00 |
|
|
|
0bef1ca389
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-12-01 10:22:47 +08:00 |
|
|
|
e8129eed10
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-12-01 10:05:45 +08:00 |
|
|
|
133aeab44c
|
fix: 增加软删除过滤
|
2025-12-01 09:58:28 +08:00 |
|
|
|
d8f9c53504
|
fix: 过滤软删除
|
2025-12-01 09:36:18 +08:00 |
|
|
|
c9e6daba72
|
fix: 过滤软删除
|
2025-12-01 09:29:44 +08:00 |
|
|
|
948bb5e5a0
|
fix: 过滤软删除
|
2025-12-01 09:28:05 +08:00 |
|
|
|
18530c60cd
|
feat: 增加一个接口
|
2025-11-29 17:00:57 +08:00 |
|
|
|
a05ec1ade7
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-11-29 16:47:23 +08:00 |
|
|
|
59f2b223ba
|
Merge branch 'feat-cjy-taskBench'
|
2025-11-29 16:26:24 +08:00 |
|
|
|
cb718a7e8e
|
fix: 修复
|
2025-11-29 16:26:11 +08:00 |
|
|
|
7ec6256eab
|
Merge branch 'feat-cjy-taskBench'
|
2025-11-29 16:05:47 +08:00 |
|
|
|
4f42026597
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-11-29 16:02:38 +08:00 |
|
|
|
a471934267
|
fix: 修复释放视频数量错误
|
2025-11-29 16:02:23 +08:00 |
|
|
|
c7bb9e4b8e
|
Merge branch 'feat-cjy-taskBench'
|
2025-11-29 15:47:54 +08:00 |
|
|
|
7c4933abb9
|
fix: 修复已消费视频消耗两次的问题
|
2025-11-29 15:47:38 +08:00 |
|
|
|
6f4b77286f
|
Merge branch 'feat-cjy-taskBench'
|
2025-11-29 15:27:39 +08:00 |
|
|
|
087690eb4e
|
fix: 修复发放额度不对的问题
|
2025-11-29 15:27:23 +08:00 |
|
|
|
4152832b11
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-29 13:05:10 +08:00 |
|
|
|
2d0adbedcc
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-29 11:02:25 +08:00 |
|
|
|
9812725c61
|
fix: 允许可指派数量出现负数
|
2025-11-29 10:51:28 +08:00 |
|
|
|
f808a6ed98
|
feat: 默认布局接口新添加4个字段
|
2025-11-29 10:50:41 +08:00 |
|
|
|
9899617486
|
fix: 修复计算可指派任务逻辑不正确的问题
|
2025-11-29 10:26:48 +08:00 |
|
|
|
e9b01cb66b
|
feat: 针对已中止的任务，统计实际未完成的数量
|
2025-11-29 10:14:36 +08:00 |
|
|
|
83a30d6958
|
feat: 新增可指派字段
|
2025-11-28 17:46:41 +08:00 |
|
