jiaji.H
|
88c0000cb0
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225'
|
2026-02-09 15:23:14 +08:00 |
|
jiaji.H
|
c8b201a47d
|
Updata：增加空值判断
|
2026-02-09 15:23:02 +08:00 |
|
|
|
40675cae21
|
fix: 改为秒级时间戳
|
2026-02-09 11:39:03 +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 |
|
|
|
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 |
|
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 |
|
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 |
|
|
|
898b9ca9c5
|
Revert "feat:产品需要待上传视频脚本和待指派视频脚本的数量减掉2025年上传的视频数"
This reverts commit deb68e25a9.
|
2026-02-06 11:16:23 +08:00 |
|
|
|
6ad2d52e9d
|
feat：任务管理台增加竞品报告
|
2026-02-06 11:15:01 +08:00 |
|
|
|
deb68e25a9
|
feat:产品需要待上传视频脚本和待指派视频脚本的数量减掉2025年上传的视频数
|
2026-02-06 09:44:42 +08:00 |
|
|
|
9ee3e15938
|
feat:增加竞品报告的相关字段
|
2026-02-06 09:19:38 +08:00 |
|
|
|
72f23c58b6
|
fix: 移除没用的表
|
2026-02-06 09:17:33 +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
|
be2f8316e2
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-04 15:23:28 +08:00 |
|
jiaji.H
|
6676bdbe2a
|
Updata：更新查询sql
|
2026-02-04 15:23:20 +08:00 |
|
jiaji.H
|
4a37beca0a
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-04 13:48:26 +08:00 |
|
jiaji.H
|
a2e8d98cee
|
Updata：增加类型选择
|
2026-02-04 13:33:16 +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 |
|
|
|
e7188528f0
|
Merge branch 'feat-zjy-fixbug-033' into dev
|
2026-02-04 13:15:38 +08:00 |
|
|
|
9ddb7e8276
|
fix: 调整创建订单的uuid
|
2026-02-04 13:15:18 +08:00 |
|
|
|
00460ed290
|
Merge branch 'feat-zjy-fixbug-033' into dev
|
2026-02-04 13:09:05 +08:00 |
|
|
|
151abc145b
|
fix: 调整创建订单的uuid
|
2026-02-04 13:08:18 +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 |
|
|
|
ac9bee2a83
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-02-04 11:26:46 +08:00 |
|
|
|
6ef896b009
|
fix: rizhi
|
2026-02-04 11:26:30 +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
|
ef3dd698e5
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 10:46:45 +08:00 |
|
jiaji.H
|
deaac40fad
|
Updata：更新发票时间检索
|
2026-02-04 10:46:38 +08:00 |
|
