jiaji.H
|
c989ca46c3
|
Updata：解决冲突
|
2026-03-11 17:24:46 +08:00 |
|
jiaji.H
|
23b996bfd5
|
Updata：增加字段
|
2026-03-11 17:24:15 +08:00 |
|
jiaji.H
|
b9f7da8dc7
|
Merge branch 'feat-hjj-QuestionnaireSurvey' into dev
|
2026-03-11 16:54:48 +08:00 |
|
jiaji.H
|
bd15ee93e9
|
Updata：修正逻辑
|
2026-03-11 16:54:41 +08:00 |
|
jiaji.H
|
5ec92819ea
|
Updata：解决冲突
|
2026-03-11 16:29:23 +08:00 |
|
jiaji.H
|
f548ac9571
|
feat：新增问卷调查模块逻辑
|
2026-03-11 16:17:57 +08:00 |
|
jiaji.H
|
fa0df21e7d
|
Merge branch 'feat-hjj-MetricsManager#260226' into dev
|
2026-03-11 10:04:47 +08:00 |
|
jiaji.H
|
4a35f6fa9d
|
Updata：增加艺人编号检索与补充显示字段
|
2026-03-11 10:03:29 +08:00 |
|
jiaji.H
|
e255be1a06
|
Merge branch 'feat-hjj-MetricsManager#260226' into dev
|
2026-03-06 14:33:40 +08:00 |
|
jiaji.H
|
691ffa96de
|
Updata：更新竞品数导出数据计算
|
2026-03-06 14:33:25 +08:00 |
|
|
|
bd8fbfb292
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# internal/dao/taskDao.go
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-13 10:10:17 +08:00 |
|
jiaji.H
|
2369e5c210
|
Updata：解决冲突
|
2026-02-10 15:36:10 +08:00 |
|
jiaji.H
|
b7b5033704
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-10 14:44:52 +08:00 |
|
jiaji.H
|
5c1fe7155e
|
Updata：增加字段赋值
|
2026-02-10 14:44:46 +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 |
|
jiaji.H
|
56bf52dad9
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225'
|
2026-02-10 09:37:58 +08:00 |
|
jiaji.H
|
39a9518d08
|
Updata：增加金额的精度计算
|
2026-02-10 09:37:51 +08:00 |
|
|
|
db11e81282
|
Merge branch 'feat-cjy-taskBench' into dev
|
2026-02-09 18:25:15 +08:00 |
|
|
|
b37f35ec67
|
fix: 布局接口增加竞品报告相关字段
|
2026-02-09 16:11:41 +08:00 |
|
|
|
7b39f34a43
|
feat：增加一个接口，获取最除非续费订单的套餐开始时间
# Conflicts:
# internal/dao/orderRecordsDao.go
# pb/bundle/bundle.pb.go
|
2026-02-09 11:38:16 +08:00 |
|
jiaji.H
|
a78bf365a7
|
Updata：解决冲突
|
2026-02-09 11:29:51 +08:00 |
|
jiaji.H
|
db2b6b6205
|
Updata：解决冲突
|
2026-02-09 11:29:12 +08:00 |
|
|
|
0bba264009
|
解决冲突
|
2026-02-09 11:28:51 +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
|
4fc597520d
|
Merge branch 'jng' into dev
|
2026-02-06 15:14:59 +08:00 |
|
jiaji.H
|
ed13b84ecc
|
Updata:修正第一个月余量发放
|
2026-02-06 15:14:47 +08:00 |
|
jiaji.H
|
f6bcbb2fa1
|
Merge branch 'jng' into dev
|
2026-02-06 14:18:13 +08:00 |
|
jiaji.H
|
5d5127b8e5
|
Updata：修正paytime获取
|
2026-02-06 14:18:01 +08:00 |
|
|
|
b764722fab
|
feat: 查询任务完成日志，根据任务的uuid查询对应作品的uuid列表
|
2026-02-06 13:41:31 +08:00 |
|
|
|
6ad2d52e9d
|
feat：任务管理台增加竞品报告
|
2026-02-06 11:15:01 +08:00 |
|
|
|
4d56bab91d
|
fix:日志添加竞品报告和视频脚本
|
2026-02-05 15:37:39 +08:00 |
|
|
|
719d81347d
|
fix:日志添加竞品报告和视频脚本
|
2026-02-05 15:36:46 +08:00 |
|
jiaji.H
|
40fd5345c1
|
Merge branch 'jng' into dev
|
2026-02-05 15:05:22 +08:00 |
|
jiaji.H
|
85bceb0af9
|
Updata:更新新建余量信息
|
2026-02-05 15:04:20 +08:00 |
|
jiaji.H
|
0f4b7e5a72
|
Merge branch 'jng' into dev
|
2026-02-04 16:57:52 +08:00 |
|
jiaji.H
|
94990cadbc
|
Updata:修正bug
|
2026-02-04 16:56:54 +08:00 |
|
jiaji.H
|
48b3caefbf
|
Merge branch 'jng' into dev
|
2026-02-04 16:18:55 +08:00 |
|
jiaji.H
|
7c99427a4d
|
Updata：增加log
|
2026-02-04 16:18:44 +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 |
|
|
|
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 |
|
|
|
1809d98cdb
|
Update orderRecordsLogic.go
|
2026-02-04 11:15:04 +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 |
|
