Commit Graph

1104 Commits

Author SHA1 Message Date
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
cjy
716948d4ea Merge branch 'feat-cjy-taskBench' into dev 2025-12-10 15:39:36 +08:00
cjy
28f5055895 fix: 更新计算逻辑 2025-12-10 15:39:27 +08:00
cjy
5384c0902a Merge branch 'feat-cjy-taskBench' into dev 2025-12-10 14:57:47 +08:00
cjy
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
JNG
d2613d7f91 解决冲突 2025-12-09 11:10:14 +08:00
JNG
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
cjy
0aeda33f32 fix: 修复视频脚本测试与正式环境时区不一致的问题 2025-12-01 10:43:09 +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
133aeab44c fix: 增加软删除过滤 2025-12-01 09:58:28 +08:00
cjy
d8f9c53504 fix: 过滤软删除 2025-12-01 09:36:18 +08:00
cjy
c9e6daba72 fix: 过滤软删除 2025-12-01 09:29:44 +08:00
cjy
948bb5e5a0 fix: 过滤软删除 2025-12-01 09:28:05 +08:00
cjy
18530c60cd feat: 增加一个接口 2025-11-29 17:00:57 +08:00
cjy
a05ec1ade7 Merge branch 'feat-cjy-taskBench' into dev 2025-11-29 16:47:23 +08:00
cjy
59f2b223ba Merge branch 'feat-cjy-taskBench' 2025-11-29 16:26:24 +08:00
cjy
cb718a7e8e fix: 修复 2025-11-29 16:26:11 +08:00
cjy
7ec6256eab Merge branch 'feat-cjy-taskBench' 2025-11-29 16:05:47 +08:00
cjy
4f42026597 Merge branch 'feat-cjy-taskBench' into dev 2025-11-29 16:02:38 +08:00