|
|
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
|
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 |
|
|
|
3287f7c66e
|
fix: 改为秒级时间戳
|
2026-02-06 17:52:02 +08:00 |
|
|
|
285bddad15
|
feat：增加一个接口，获取最除非续费订单的套餐开始时间
# Conflicts:
# internal/dao/orderRecordsDao.go
# pb/bundle/bundle.pb.go
|
2026-02-06 16:27:52 +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 |
|
|
|
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
|
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 |
|
jiaji.H
|
6b7df996a3
|
Updata：解决冲突
|
2026-02-02 11:21:23 +08:00 |
|
jiaji.H
|
0a273e7e32
|
Updata：增加H5获取用户发票列表
|
2026-02-02 10:56:54 +08:00 |
|
|
|
dcfe12ba09
|
Merge branch 'fix-cjy-main' into dev
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-02 10:21:31 +08:00 |
|
|
|
7581a337a7
|
解决冲突
|
2026-01-30 15:42:37 +08:00 |
|
|
|
0c930af71a
|
添加接口
|
2026-01-30 15:41:55 +08:00 |
|
|
|
d74cc74369
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-01-30 15:31:53 +08:00 |
|
|
|
c57b60230b
|
feat: 增加推荐人列表
|
2026-01-30 15:30:57 +08:00 |
|
jiaji.H
|
6ac8b2b1b4
|
Updata:解决冲突
|
2026-01-30 15:18:47 +08:00 |
|
jiaji.H
|
63ccfb5c90
|
Updata:解决冲突
|
2026-01-30 12:42:08 +08:00 |
|
|
|
321d7483a5
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-01-30 11:43:31 +08:00 |
|
jiaji.H
|
ca02baa840
|
Updata:增加导出发布作品数据临时接口
|
2026-01-30 11:39:18 +08:00 |
|
|
|
a903157725
|
feat：增加合同管理接口
|
2026-01-30 09:33:52 +08:00 |
|
|
|
8c171a2416
|
feat:增加客户管理相关接口
|
2026-01-29 09:51:43 +08:00 |
|
jiaji.H
|
b89f41fd6f
|
Updata:更新字段
|
2026-01-28 16:37:10 +08:00 |
|
jiaji.H
|
e73aabf106
|
Updata:增加发票管理模块
|
2026-01-28 13:45:59 +08:00 |
|
|
|
d2b6ac8f7f
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-21 10:35:16 +08:00 |
|
|
|
e1702d7b46
|
把所有请求参数放到dto文件
|
2026-01-21 10:26:49 +08:00 |
|
|
|
26044470f0
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-21 10:11:45 +08:00 |
|
|
|
4d8203bf8c
|
增加 dto 用来放请求参数
|
2026-01-21 10:11:36 +08:00 |
|
|
|
eb6a6363ef
|
Merge branch 'feat-hjj-Competitors#A203' into dev
# Conflicts:
# pkg/cron/cron.go
|
2026-01-21 10:02:08 +08:00 |
|
|
|
a03f14de50
|
删除没用controller层没用的注释
|
2026-01-20 17:48:23 +08:00 |
|
|
|
2a75c3eb78
|
移除没用的代码
|
2026-01-20 17:30:54 +08:00 |
|
jiaji.H
|
c4ec01846f
|
Updata:调整余量更新定时任务至客户端
|
2026-01-12 13:28:47 +08:00 |
|
|
|
0bf1f34bba
|
feat: 增加日志创建
|
2025-12-28 11:40:57 +08:00 |
|
|
|
d11a7a5c6a
|
解决冲突
|
2025-12-26 11:43:26 +08:00 |
|
|
|
fa640ed8ef
|
修改合同签署
|
2025-12-25 18:44:43 +08:00 |
|
jiaji.H
|
b345333255
|
Updata：补充代码
|
2025-12-16 16:02:38 +08:00 |
|
|
|
1b2e5f8fd1
|
11
|
2025-12-09 11:07:16 +08:00 |
|
|
|
0bef1ca389
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-12-01 10:22:47 +08:00 |
|
|
|
18530c60cd
|
feat: 增加一个接口
|
2025-11-29 17:00:57 +08:00 |
|
|
|
4152832b11
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-29 13:05:10 +08:00 |
|
