|
|
cebf10a3e6
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 09:25:01 +08:00 |
|
|
|
cccee7f86e
|
fix：修复逻辑
|
2026-01-26 09:24:35 +08:00 |
|
|
|
1277e0da8d
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 17:00:12 +08:00 |
|
|
|
adf3b5ee89
|
fix: 竞品报告需要扣减余额，以及修改错误提示语
|
2026-01-23 16:59:44 +08:00 |
|
|
|
9bd8e67116
|
Merge branch 'feat-cjy-report' into dev
# Conflicts:
# pkg/model/cast/work.go
|
2026-01-14 17:43:51 +08:00 |
|
jiaji.H
|
8d36aeb751
|
Updata：解决冲突
|
2026-01-14 13:42:58 +08:00 |
|
jiaji.H
|
efe79ec250
|
Updata：解决冲突
|
2026-01-13 16:40:05 +08:00 |
|
jiaji.H
|
dca004ecc6
|
Updata：解决冲突
|
2026-01-13 14:17:54 +08:00 |
|
jiaji.H
|
b121c12f7c
|
Updata:增加支持多月份导出
|
2026-01-13 14:09:55 +08:00 |
|
jiaji.H
|
e75e6b7ce9
|
Updata：增加竞品数pb
|
2026-01-13 09:36:01 +08:00 |
|
jiaji.H
|
6dde482bb4
|
Updata：补充代码
|
2026-01-08 16:00:09 +08:00 |
|
jiaji.H
|
4f74232571
|
Updata：补充代码
|
2026-01-08 15:59:43 +08:00 |
|
jiaji.H
|
150452f067
|
Updata:作品确认时增加判断套餐是否过期
|
2026-01-08 15:57:29 +08:00 |
|
jiaji.H
|
daad39d53c
|
Updata：更新表格样式
|
2026-01-05 11:51:20 +08:00 |
|
jiaji.H
|
bf4ccd87dd
|
Updata：解决冲突
|
2026-01-05 11:47:07 +08:00 |
|
jiaji.H
|
b52190f021
|
Updata：补充导出数据字段
|
2026-01-05 11:46:02 +08:00 |
|
jiaji.H
|
2a38ed44b0
|
Updata：增加竞品数类型数据
|
2026-01-04 15:04:09 +08:00 |
|
|
|
f88e745ab7
|
Merge branch 'feat-cjy-data'
# Conflicts:
# api/aryshare/ayrshare.pb.go
# api/aryshare/ayrshare.validator.pb.go
# api/bundle/bundle.pb.go
# api/bundle/bundle.validator.pb.go
# api/bundle/bundle_triple.pb.go
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
# api/cast/cast_triple.pb.go
# pkg/cron/task.go
# pkg/model/cast/work.go
|
2025-12-26 13:28:55 +08:00 |
|
jiaji.H
|
1e19761356
|
Updata：增加失败类型
|
2025-12-18 19:25:21 +08:00 |
|
jiaji.H
|
2ebfe14652
|
Merge branch 'feat-hjj-BundleStratusInfo' into dev
|
2025-12-18 17:36:30 +08:00 |
|
jiaji.H
|
6cd2077886
|
Updata：增加套餐过期判断
|
2025-12-18 17:36:09 +08:00 |
|
jiaji.H
|
c2b4114bd5
|
Updata：解决冲突
|
2025-12-17 16:24:53 +08:00 |
|
jiaji.H
|
ccf51138e3
|
Updata：更新逻辑
|
2025-12-17 16:21:03 +08:00 |
|
jiaji.H
|
d53eee5f9e
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev
|
2025-12-17 11:48:37 +08:00 |
|
jiaji.H
|
70ad3b74a1
|
Updata：修正余量判断
|
2025-12-17 11:46:55 +08:00 |
|
|
|
f954df6bd6
|
Merge branch 'feat-cjy-data' into dev
|
2025-12-16 19:45:55 +08:00 |
|
|
|
0a035cfeab
|
fix: 增加日志
|
2025-12-16 19:45:40 +08:00 |
|
|
|
e481f61a53
|
Merge branch 'feat-cjy-data' into dev
# Conflicts:
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
|
2025-12-16 19:33:48 +08:00 |
|
|
|
8fedc385c6
|
fix：增加日志
|
2025-12-16 19:32:14 +08:00 |
|
|
|
4e658732da
|
Merge branch 'feat-cjy-data' into dev
|
2025-12-11 15:00:59 +08:00 |
|
|
|
f5b1cf00e3
|
fix: 修复自动已读位置
|
2025-12-11 14:58:59 +08:00 |
|
|
|
137829c50a
|
Merge branch 'feat-cjy-data' into dev
|
2025-12-09 15:58:05 +08:00 |
|
|
|
1e11204947
|
feat: 增加 h5 确认接口和待确认列表接口
|
2025-12-09 15:56:41 +08:00 |
|
jiaji.H
|
1ae5d89d29
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-11-26 11:47:35 +08:00 |
|
jiaji.H
|
5ba9a06fc1
|
Updata：更新接口错误返回
|
2025-11-26 11:47:25 +08:00 |
|
jiaji.H
|
4b21bfd759
|
Merge branch 'feat-hjj-CastWork#' into dev
|
2025-11-26 11:42:53 +08:00 |
|
jiaji.H
|
63a58f4482
|
Updata:更新接口错误返回
|
2025-11-26 11:41:05 +08:00 |
|
|
|
e32b2e8b9a
|
Merge branch 'dev-lzh-1029' into dev
|
2025-11-10 15:09:16 +08:00 |
|
|
|
cf1ff1022c
|
自媒体账号管理接口修改
|
2025-11-10 15:09:09 +08:00 |
|
|
|
9d8d900f74
|
Merge branch 'main' into dev
|
2025-10-30 11:02:38 +08:00 |
|
|
|
0ff2963de4
|
保留两位小数
|
2025-10-28 20:12:39 +08:00 |
|
|
|
f212e872ae
|
修改表格样式
|
2025-10-28 17:01:13 +08:00 |
|
|
|
90bf6de27d
|
作品状态
|
2025-10-28 13:54:15 +08:00 |
|
|
|
891782a674
|
新增表格字段
|
2025-10-28 11:15:33 +08:00 |
|
|
|
fc06dda836
|
修改表格样式
|
2025-10-28 10:11:01 +08:00 |
|
|
|
14e5b3c49c
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-24 17:06:48 +08:00 |
|
|
|
58bbc7267d
|
单价保留两位小数
|
2025-10-24 17:06:42 +08:00 |
|
|
|
36f1e4c609
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 15:49:23 +08:00 |
|
|
|
88fd3e80b3
|
1
|
2025-10-21 15:49:17 +08:00 |
|
|
|
cdbb266503
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 14:59:43 +08:00 |
|
