Commit Graph

142 Commits

Author SHA1 Message Date
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
f5cb5050cf Updata:解决冲突 2026-02-26 15:35:28 +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
jiaji.H
2369e5c210 Updata:解决冲突 2026-02-10 15:36:10 +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
daccf29f02 Updata:增加更新发票url接口 2026-02-10 10:48:25 +08:00
cjy
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
JNG
0bba264009 解决冲突 2026-02-09 11:28:51 +08:00
cjy
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
cjy
285bddad15 feat:增加一个接口,获取最除非续费订单的套餐开始时间
# Conflicts:
#	internal/dao/orderRecordsDao.go
#	pb/bundle/bundle.pb.go
2026-02-06 16:27:52 +08:00
cjy
b764722fab feat: 查询任务完成日志,根据任务的uuid查询对应作品的uuid列表 2026-02-06 13:41:31 +08:00
cjy
6ad2d52e9d feat:任务管理台增加竞品报告 2026-02-06 11:15:01 +08:00
jiaji.H
dc55fa5dfe Updata:解决冲突 2026-02-04 13:22:16 +08:00
c7cbe76848 fix: 调整创建订单的uuid 2026-02-04 12:18:07 +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
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
cjy
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
JNG
eee821c4cb 11 2026-02-03 10:01:36 +08:00
jiaji.H
c348409a73 Updata:更新数据创建 2026-02-02 20:00:28 +08:00
jiaji.H
ae95c7dd4a Updata:增加字段 2026-02-02 19:40:10 +08:00
jiaji.H
a46add94a4 Updata:解决冲突 2026-02-02 14:13:11 +08:00
jiaji.H
6b1f03a42a Updata:解决冲突 2026-02-02 13:42:44 +08:00
jiaji.H
8db49c0db9 Updata:增加字段 2026-02-02 13:39:09 +08:00
jiaji.H
6b7df996a3 Updata:解决冲突 2026-02-02 11:21:23 +08:00
jiaji.H
1389a4ad94 Updata:修改数据结构 2026-02-02 11:14:50 +08:00
jiaji.H
0a273e7e32 Updata:增加H5获取用户发票列表 2026-02-02 10:56:54 +08:00
cjy
0ae0e32db9 Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2026-02-02 10:22:10 +08:00
cjy
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
cjy
9750b0b505 feat:附件增加一个文件名称 2026-02-02 10:09:02 +08:00
JNG
7581a337a7 解决冲突 2026-01-30 15:42:37 +08:00
JNG
0c930af71a 添加接口 2026-01-30 15:41:55 +08:00
cjy
d74cc74369 Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
2026-01-30 15:31:53 +08:00
cjy
c57b60230b feat: 增加推荐人列表 2026-01-30 15:30:57 +08:00
jiaji.H
6ac8b2b1b4 Updata:解决冲突 2026-01-30 15:18:47 +08:00
cjy
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
cjy
dffbc59d06 feat:更新pb 2026-01-30 09:34:04 +08:00
cjy
69bb9794a8 feat:更新pb 2026-01-29 09:52:02 +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
jiaji.H
c4ec01846f Updata:调整余量更新定时任务至客户端 2026-01-12 13:28:47 +08:00
cjy
0bf1f34bba feat: 增加日志创建 2025-12-28 11:40:57 +08:00
JNG
d11a7a5c6a 解决冲突 2025-12-26 11:43:26 +08:00