Commit Graph

1734 Commits

Author SHA1 Message Date
jiaji.H
d4c5f7b8e6 Updata:解决冲突 2026-03-11 17:17:22 +08:00
jiaji.H
5bba22d18a Updata:增加字段 2026-03-11 17:16:57 +08:00
jiaji.H
8297b006dc Updata:解决冲突 2026-03-11 17:16:09 +08:00
jiaji.H
9d31ce3d05 Updata:增加字段 2026-03-11 17:14:15 +08:00
jiaji.H
c8a5f27ad0 Updata:解决冲突 2026-03-11 17:05:28 +08:00
jiaji.H
447cbff99e Updata:更新pb文件 2026-03-11 17:04:49 +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
jiaji.H
374d1472da Merge branch 'feat-hjj-MetricsManager#260226' into dev 2026-03-03 16:14:46 +08:00
jiaji.H
3baffe8d2f Updata:修正检索 2026-03-03 16:14:38 +08:00
jiaji.H
e35e3821c8 Merge branch 'feat-hjj-MetricsManager#260226' into dev 2026-02-26 16:21:07 +08:00
jiaji.H
45620df185 Updata:优化sql 2026-02-26 16:20:46 +08:00
jiaji.H
4c81f80d5f Merge branch 'feat-hjj-MetricsManager#260226' into dev 2026-02-26 16:17:31 +08:00
jiaji.H
e4fa5eb9de Updata:优化查询sql 2026-02-26 16:17:16 +08:00
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
cjy
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
cjy
253f2ee33b fix:不再联表
# Conflicts:
#	internal/dao/taskDao.go
2026-02-13 10:08:10 +08:00
cjy
f0baf86685 Revert "优化查询速度"
This reverts commit 4298eb9f2f030b29fbf2b931cadbea9df9f5fb3b.
2026-02-13 10:04:35 +08:00
cjy
e82cfd8861 优化查询速度 2026-02-13 09:49:41 +08:00
cjy
2051f44b1c fix:增加排序键,防止批量指派时operator_time的时间一致 2026-02-12 18:36:01 +08:00
cjy
58bb294435 fix:增加排序键,防止批量指派时operator_time的时间一致 2026-02-12 18:33:30 +08:00
cjy
252a0fbdfe fix:不再联表 2026-02-12 16:44:27 +08:00
cjy
e16e8e49b8 fix:不再联表
# Conflicts:
#	internal/dao/taskDao.go
2026-02-12 16:39:45 +08:00
cjy
a2112f9026 Merge branch 'feat-cjy-taskBench' into dev 2026-02-11 16:24:45 +08:00
cjy
571dc8f5a9 fix: 修复查询失败 2026-02-11 16:24:37 +08:00
cjy
bc6e37bb13 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2026-02-11 16:17:32 +08:00
cjy
7ce953fd5c fix:不再关联实名表,提高查询速度 2026-02-11 16:16:54 +08:00
cjy
94445e0ea8 Revert "fix: 待确认列表新增返回字段"
This reverts commit 5dc2538a50.

# Conflicts:
#	pb/bundle/bundle.pb.go
2026-02-11 15:36:27 +08:00
cjy
eeb6616636 Revert "fix: 待确认列表新增返回字段"
This reverts commit 5dc2538a50.
2026-02-11 15:35:44 +08:00
cjy
6aaa8f3618 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2026-02-11 14:01:39 +08:00
cjy
5dc2538a50 fix: 待确认列表新增返回字段 2026-02-11 14:01:08 +08:00
cjy
59b0342478 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2026-02-10 16:37:11 +08:00
cjy
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