jiaji.H
|
b8aa941f75
|
Updata：解决冲突
|
2026-01-09 11:36:44 +08:00 |
|
jiaji.H
|
e5baa91e9d
|
Updata：增加youtube和bluesky账号数据导出
|
2026-01-09 11:23:53 +08:00 |
|
|
|
3584a9f948
|
Merge branch 'fix-cjy-workNum'
|
2026-01-07 13:22:47 +08:00 |
|
|
|
4f01d924d6
|
fix:过滤user表和real_name 表软删除的记录
# Conflicts:
# internal/dao/taskDao.go
|
2026-01-07 13:11:17 +08:00 |
|
|
|
fc25533193
|
fix:过滤user表和real_name 表软删除的记录
# Conflicts:
# internal/dao/taskDao.go
|
2026-01-07 13:10:56 +08:00 |
|
|
|
fa79376e51
|
Merge branch 'feat-zjy-fixbug-023' into dev
# Conflicts:
# internal/dao/bundleExtend.go
|
2026-01-07 10:53:29 +08:00 |
|
|
|
71f7be5716
|
fix: 支付回调，更新手续费
|
2026-01-07 10:50:51 +08:00 |
|
|
|
55a5ba3152
|
Merge branch 'jng'
|
2026-01-06 11:31:39 +08:00 |
|
|
|
ebf579a1a9
|
Merge branch 'jng' into dev
|
2026-01-05 15:16:43 +08:00 |
|
|
|
185e5da57a
|
Update bundle_order_records.go
|
2026-01-05 15:16:37 +08:00 |
|
jiaji.H
|
a795b5b491
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 13:47:38 +08:00 |
|
jiaji.H
|
55d1554e13
|
Updata：修正查询sql
|
2026-01-05 13:46:25 +08:00 |
|
jiaji.H
|
3b9661f03b
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 11:40:44 +08:00 |
|
jiaji.H
|
b9c44fdc7e
|
Updata：修正sql
|
2026-01-05 11:40:34 +08:00 |
|
jiaji.H
|
7b7ddd9613
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 11:24:07 +08:00 |
|
jiaji.H
|
5ad9417042
|
Updata:导出补充竞品数字段
|
2026-01-05 11:23:55 +08:00 |
|
jiaji.H
|
fbd3c97547
|
Updata:解决冲突
|
2026-01-05 10:45:33 +08:00 |
|
jiaji.H
|
65ffc2c43a
|
Updata
|
2026-01-04 16:22:50 +08:00 |
|
jiaji.H
|
44c4a8627c
|
Updata：修正数据分析发放值
|
2026-01-04 16:22:18 +08:00 |
|
jiaji.H
|
7c4c7b0faa
|
Updata：更新余量定时任务发放数
|
2026-01-04 16:20:34 +08:00 |
|
jiaji.H
|
9632dc121a
|
Merge branch 'feat-hjj-BalanceManager' into dev
|
2026-01-04 16:02:01 +08:00 |
|
jiaji.H
|
8f5c21e3f2
|
Updata:修正bug
|
2026-01-04 16:01:51 +08:00 |
|
|
|
f228f73ef3
|
解决冲突
|
2026-01-04 15:13:08 +08:00 |
|
|
|
d730106309
|
添加自媒体账号选择
|
2026-01-04 15:11:45 +08:00 |
|
jiaji.H
|
f40fc853de
|
feat:列表布局增加竞品数字段
|
2026-01-04 14:32:08 +08:00 |
|
jiaji.H
|
2a75b9b6db
|
Updata：套餐与余量增加竞品数字段与对应功能
|
2026-01-04 11:12:34 +08:00 |
|
|
|
64a11237a3
|
fix: 修复重复引用
|
2025-12-28 13:00:47 +08:00 |
|
|
|
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 |
|
|
|
0bf1f34bba
|
feat: 增加日志创建
|
2025-12-28 11:40:57 +08:00 |
|
jiaji.H
|
32a9bb8283
|
Updata：修正套餐状态判断
|
2025-12-26 16:51:16 +08:00 |
|
jiaji.H
|
0e64d40489
|
Updata：增加套餐类型字段
|
2025-12-26 14:24:05 +08:00 |
|
|
|
d11a7a5c6a
|
解决冲突
|
2025-12-26 11:43:26 +08:00 |
|
|
|
edc85ae53e
|
解决冲突
|
2025-12-26 11:42:47 +08:00 |
|
|
|
7bc24961bf
|
Merge branch 'fix-cjy-workNum' into dev
|
2025-12-26 09:52:57 +08:00 |
|
|
|
c3873e0e3e
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 18:59:09 +08:00 |
|
|
|
10f336ec66
|
11
|
2025-12-25 18:59:03 +08:00 |
|
|
|
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 |
|
