|
|
94445e0ea8
|
Revert "fix: 待确认列表新增返回字段"
This reverts commit 5dc2538a50.
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-11 15:36:27 +08:00 |
|
|
|
6aaa8f3618
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-11 14:01:39 +08:00 |
|
|
|
5dc2538a50
|
fix: 待确认列表新增返回字段
|
2026-02-11 14:01:08 +08:00 |
|
|
|
59b0342478
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-10 16:37:11 +08:00 |
|
|
|
138a109223
|
fix:不再查询订单获取艺人uuid
|
2026-02-10 16:36:00 +08:00 |
|
jiaji.H
|
acc76444b5
|
Updata：解决冲突
|
2026-02-10 11:34:37 +08:00 |
|
jiaji.H
|
513aaf4755
|
Updata：增加付款时间返回值
|
2026-02-10 11:29:28 +08:00 |
|
jiaji.H
|
10c01b910a
|
Updata：增加订单编号检索
|
2026-02-10 11:16:57 +08:00 |
|
jiaji.H
|
daccf29f02
|
Updata：增加更新发票url接口
|
2026-02-10 10:48:25 +08:00 |
|
|
|
d2f556ff52
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-09 10:36:49 +08:00 |
|
|
|
285bddad15
|
feat：增加一个接口，获取最除非续费订单的套餐开始时间
# Conflicts:
# internal/dao/orderRecordsDao.go
# pb/bundle/bundle.pb.go
|
2026-02-06 16:27:52 +08:00 |
|
jiaji.H
|
f6bcbb2fa1
|
Merge branch 'jng' into dev
|
2026-02-06 14:18:13 +08:00 |
|
jiaji.H
|
d83cd6b23c
|
Updata:待确认列表会根据新购还是续费进行过滤
|
2026-02-06 14:04:20 +08:00 |
|
|
|
b764722fab
|
feat: 查询任务完成日志，根据任务的uuid查询对应作品的uuid列表
|
2026-02-06 13:41:31 +08:00 |
|
|
|
d60aa877f3
|
feat:待指派任务列表和待指派数量增加上竞品报告的数量
|
2026-02-06 11:55:30 +08:00 |
|
|
|
6ad2d52e9d
|
feat：任务管理台增加竞品报告
|
2026-02-06 11:15:01 +08:00 |
|
jiaji.H
|
dc55fa5dfe
|
Updata：解决冲突
|
2026-02-04 13:22:16 +08:00 |
|
jiaji.H
|
f7271ee292
|
Updata：更新字段
|
2026-02-04 13:17:29 +08:00 |
|
|
|
c7cbe76848
|
fix: 调整创建订单的uuid
|
2026-02-04 12:18:07 +08:00 |
|
|
|
a822149b30
|
Merge branch 'feat-zjy-fixbug-033' into dev
# Conflicts:
# internal/logic/orderRecordsLogic.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-04 12:17:23 +08:00 |
|
|
|
2155d56187
|
fix: 调整创建订单的uuid
|
2026-02-04 12:13:00 +08:00 |
|
jiaji.H
|
c500eeec84
|
Updata:解决冲突
|
2026-02-04 11:16:38 +08:00 |
|
jiaji.H
|
36a134a1e8
|
Updata：增加是否续费
|
2026-02-04 11:15:19 +08:00 |
|
jiaji.H
|
3dac79736b
|
Updata：解决冲突
|
2026-02-04 10:26:37 +08:00 |
|
jiaji.H
|
f219ed3b05
|
Updata：更新字段
|
2026-02-04 10:23:11 +08:00 |
|
jiaji.H
|
013c14b9f7
|
Updata：增加获取最新发票编辑号接口
|
2026-02-04 10:18:50 +08:00 |
|
|
|
cde554ecbd
|
Merge branch 'feat-cjy-customerContract'
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-04 09:40:22 +08:00 |
|
|
|
01753b9735
|
Merge branch 'jng' into dev
|
2026-02-03 16:46:46 +08:00 |
|
|
|
4f3fcb8206
|
修改
|
2026-02-03 16:46:33 +08:00 |
|
|
|
aa772f6590
|
解决冲突
|
2026-02-03 10:19:01 +08:00 |
|
|
|
fa43fadae2
|
添加竞品数
|
2026-02-03 10:18:40 +08:00 |
|
|
|
eee821c4cb
|
11
|
2026-02-03 10:01:36 +08:00 |
|
jiaji.H
|
3bfd1007ee
|
Updata：解决冲突
|
2026-02-02 20:02:35 +08:00 |
|
jiaji.H
|
c348409a73
|
Updata：更新数据创建
|
2026-02-02 20:00:28 +08:00 |
|
jiaji.H
|
171d6b04d3
|
Updata：解决冲突
|
2026-02-02 19:46:18 +08:00 |
|
jiaji.H
|
ae95c7dd4a
|
Updata：增加字段
|
2026-02-02 19:40:10 +08:00 |
|
jiaji.H
|
5d9592b3e3
|
Updata：解决冲突
|
2026-02-02 16:45:45 +08:00 |
|
jiaji.H
|
01cb67feda
|
Updata：更新字段
|
2026-02-02 16:36:59 +08:00 |
|
jiaji.H
|
66bffabfa0
|
Updata：解决冲突
|
2026-02-02 15:39:21 +08:00 |
|
jiaji.H
|
2b23495bce
|
Updata：更新脚本导出字段
|
2026-02-02 15:38:45 +08:00 |
|
jiaji.H
|
ed8a22b0fd
|
Updata：解决冲突
|
2026-02-02 15:28:26 +08:00 |
|
jiaji.H
|
8a32b28680
|
Updata：更新pb文件
|
2026-02-02 15:27:58 +08:00 |
|
jiaji.H
|
1ffdb284ec
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 15:24:56 +08:00 |
|
jiaji.H
|
01e488555f
|
Updata：增加区号字段
|
2026-02-02 15:22:21 +08:00 |
|
jiaji.H
|
a46add94a4
|
Updata：解决冲突
|
2026-02-02 14:13:11 +08:00 |
|
jiaji.H
|
2cf1b946d0
|
Updata:更新字段
|
2026-02-02 14:09:27 +08:00 |
|
jiaji.H
|
6b1f03a42a
|
Updata：解决冲突
|
2026-02-02 13:42:44 +08:00 |
|
jiaji.H
|
8db49c0db9
|
Updata：增加字段
|
2026-02-02 13:39:09 +08:00 |
|
jiaji.H
|
6b7df996a3
|
Updata：解决冲突
|
2026-02-02 11:21:23 +08:00 |
|
jiaji.H
|
1389a4ad94
|
Updata：修改数据结构
|
2026-02-02 11:14:50 +08:00 |
|
