jiaji.H
|
3aa4a75774
|
Merge branch 'feat-hjj-MetricsManager#260226' into dev
|
2026-02-26 15:44:46 +08:00 |
|
jiaji.H
|
1acc7eadf1
|
Updata：修正sql排序问题
|
2026-02-26 15:44:37 +08:00 |
|
jiaji.H
|
f5cb5050cf
|
Updata：解决冲突
|
2026-02-26 15:35:28 +08:00 |
|
jiaji.H
|
de5bf9beba
|
Updata:优化数据指标套餐检索
|
2026-02-26 15:32:45 +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 |
|
|
|
253f2ee33b
|
fix:不再联表
# Conflicts:
# internal/dao/taskDao.go
|
2026-02-13 10:08:10 +08:00 |
|
|
|
f0baf86685
|
Revert "优化查询速度"
This reverts commit 4298eb9f2f030b29fbf2b931cadbea9df9f5fb3b.
|
2026-02-13 10:04:35 +08:00 |
|
|
|
e82cfd8861
|
优化查询速度
|
2026-02-13 09:49:41 +08:00 |
|
|
|
2051f44b1c
|
fix:增加排序键，防止批量指派时operator_time的时间一致
|
2026-02-12 18:36:01 +08:00 |
|
|
|
58bb294435
|
fix:增加排序键，防止批量指派时operator_time的时间一致
|
2026-02-12 18:33:30 +08:00 |
|
|
|
252a0fbdfe
|
fix:不再联表
|
2026-02-12 16:44:27 +08:00 |
|
|
|
e16e8e49b8
|
fix:不再联表
# Conflicts:
# internal/dao/taskDao.go
|
2026-02-12 16:39:45 +08:00 |
|
|
|
a2112f9026
|
Merge branch 'feat-cjy-taskBench' into dev
|
2026-02-11 16:24:45 +08:00 |
|
|
|
571dc8f5a9
|
fix: 修复查询失败
|
2026-02-11 16:24:37 +08:00 |
|
|
|
bc6e37bb13
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-11 16:17:32 +08:00 |
|
|
|
7ce953fd5c
|
fix:不再关联实名表，提高查询速度
|
2026-02-11 16:16:54 +08:00 |
|
|
|
94445e0ea8
|
Revert "fix: 待确认列表新增返回字段"
This reverts commit 5dc2538a50.
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-11 15:36:27 +08:00 |
|
|
|
eeb6616636
|
Revert "fix: 待确认列表新增返回字段"
This reverts commit 5dc2538a50.
|
2026-02-11 15:35:44 +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
|
0d5b3e3f3d
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225'
|
2026-02-10 16:29:33 +08:00 |
|
jiaji.H
|
a57bc7bcd5
|
Updata：更新sql字段类型
|
2026-02-10 16:29:24 +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
|
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 |
|
jiaji.H
|
2aa9b31d0a
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225'
|
2026-02-10 09:54:53 +08:00 |
|
jiaji.H
|
3d6a6cc1b7
|
Updata：修正sql
|
2026-02-10 09:54:45 +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 |
|
jiaji.H
|
ef09af1847
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225'
|
2026-02-09 15:44:35 +08:00 |
|
jiaji.H
|
b851f1a7dc
|
Updata：修改获取最后一张发票的编号逻辑
|
2026-02-09 15:44:28 +08:00 |
|
jiaji.H
|
99ff0eee12
|
Updata：增加id倒叙排列
|
2026-02-09 15:38:41 +08:00 |
|
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 |
|
