Commit Graph

402 Commits

Author SHA1 Message Date
jiaji.H
a46add94a4 Updata:解决冲突 2026-02-02 14:13:11 +08:00
jiaji.H
2cf1b946d0 Updata:更新字段 2026-02-02 14:09:27 +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
cjy
bf8bd3b9eb Merge branch 'feat-cjy-customerContract' into dev 2026-02-02 11:44:45 +08:00
cjy
c7ee97adcb fix:过滤掉周期为 -1的周期 2026-02-02 11:44:37 +08:00
cjy
c3a721d343 Merge branch 'feat-cjy-customerContract' into dev 2026-02-02 11:29:18 +08:00
cjy
2db9a511ed fix:子表的支付周期和开发周期只少有一期 2026-02-02 11:28:58 +08:00
jiaji.H
6b7df996a3 Updata:解决冲突 2026-02-02 11:21:23 +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
cjy
4858d474d5 Merge branch 'feat-cjy-customerContract' into dev 2026-01-30 17:58:24 +08:00
cjy
25f323ef66 fix: 增加字数校验 2026-01-30 17:58:13 +08:00
cjy
6f429cf9c6 Merge branch 'feat-cjy-customerContract' into dev 2026-01-30 16:42:49 +08:00
cjy
2f893c8fd4 feat:增加校验 2026-01-30 16:42:40 +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
295d26a35a fix:修复子表没有uuid的问题 2026-01-30 15:17:38 +08:00
JNG
84dacc72ce 添加购买类型字段 2026-01-30 14:26:28 +08:00
jiaji.H
63ccfb5c90 Updata:解决冲突 2026-01-30 12:42:08 +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
b5d7e7181b fix:修复格式错误 2026-01-30 11:39:17 +08:00
cjy
b8edca7df5 fix: 创建时,不需要提供客户id 2026-01-30 11:31:47 +08:00
jiaji.H
d01f325ed4 Updata:增加接口数据字段 2026-01-30 11:16:21 +08:00
cjy
83b4e13457 feat:增加校验 2026-01-30 10:42:52 +08:00
cjy
a903157725 feat:增加合同管理接口 2026-01-30 09:33:52 +08:00
jiaji.H
d282c1d1f2 Updata:增加发票编号字段 2026-01-29 11:10:54 +08:00
jiaji.H
fb0e65eadc Updata:新增字段 2026-01-29 10:46:25 +08:00
cjy
8c171a2416 feat:增加客户管理相关接口 2026-01-29 09:51:43 +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
7459f3a6c3 Merge branch 'feat-hjj-Competitors#A203' into dev 2026-01-26 13:08:30 +08:00
jiaji.H
0d1becb99b Updata:增加竞品数手动扩展字段 2026-01-26 13:08:21 +08:00
cjy
d2b6ac8f7f Merge branch 'feat-hjj-Competitors#A203' into dev 2026-01-21 10:35:16 +08:00
cjy
e1702d7b46 把所有请求参数放到dto文件 2026-01-21 10:26:49 +08:00
cjy
26044470f0 Merge branch 'feat-hjj-Competitors#A203' into dev 2026-01-21 10:11:45 +08:00
cjy
4d8203bf8c 增加 dto 用来放请求参数 2026-01-21 10:11:36 +08:00
cjy
eb6a6363ef Merge branch 'feat-hjj-Competitors#A203' into dev
# Conflicts:
#	pkg/cron/cron.go
2026-01-21 10:02:08 +08:00
cjy
2a75c3eb78 移除没用的代码 2026-01-20 17:30:54 +08:00
jiaji.H
3abd57aa9a Updata:解决冲突 2026-01-14 13:33:23 +08:00
jiaji.H
36a751b8ac Updata:解决冲突 2026-01-13 16:39:08 +08:00
jiaji.H
ea7b94baf0 Updata:解决冲突 2026-01-13 14:13:54 +08:00
jiaji.H
137e752c1b Updata:导出支持选择多个月份进行导出 2026-01-13 13:50:58 +08:00
jiaji.H
94258657e7 Updata:解决冲突 2026-01-13 09:43:01 +08:00