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
|
dc55fa5dfe
|
Updata：解决冲突
|
2026-02-04 13:22:16 +08:00 |
|
jiaji.H
|
f7271ee292
|
Updata：更新字段
|
2026-02-04 13:17:29 +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 |
|
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
|
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 |
|
|
|
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 |
|
|
|
cae38a028c
|
Merge branch 'jng' into dev
|
2026-02-04 09:38:33 +08:00 |
|
jiaji.H
|
911ac27b72
|
Updata：增加续费用户账号使用逻辑
|
2026-02-04 09:37:26 +08:00 |
|
jiaji.H
|
23ea832e31
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:26:31 +08:00 |
|
jiaji.H
|
c25d7dbdb0
|
Updata：更新字段类型
|
2026-02-03 13:26:23 +08:00 |
|
|
|
aa772f6590
|
解决冲突
|
2026-02-03 10:19:01 +08:00 |
|
|
|
fa43fadae2
|
添加竞品数
|
2026-02-03 10:18:40 +08:00 |
|
|
|
eee821c4cb
|
11
|
2026-02-03 10:01:36 +08:00 |
|
jiaji.H
|
1ffdb284ec
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 15:24:56 +08:00 |
|
jiaji.H
|
574fa6e3e6
|
Updata：增加区号
|
2026-02-02 15:24:32 +08:00 |
|
jiaji.H
|
111adcbcd9
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/micro-bundle into dev
|
2026-02-02 14:13:16 +08:00 |
|
jiaji.H
|
a46add94a4
|
Updata：解决冲突
|
2026-02-02 14:13:11 +08:00 |
|
|
|
aef6696a70
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 14:09:35 +08:00 |
|
jiaji.H
|
2cf1b946d0
|
Updata:更新字段
|
2026-02-02 14:09:27 +08:00 |
|
|
|
99d05a503a
|
fix：最近更新时间精度精确到分钟
|
2026-02-02 14:09:24 +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 |
|
|
|
bf8bd3b9eb
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 11:44:45 +08:00 |
|
|
|
c7ee97adcb
|
fix：过滤掉周期为 -1的周期
|
2026-02-02 11:44:37 +08:00 |
|
|
|
c3a721d343
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 11:29:18 +08:00 |
|
|
|
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 |
|
|
|
0ae0e32db9
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-02 10:22:10 +08:00 |
|
|
|
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 |
|
|
|
9750b0b505
|
feat:附件增加一个文件名称
|
2026-02-02 10:09:02 +08:00 |
|
|
|
4858d474d5
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-01-30 17:58:24 +08:00 |
|
|
|
25f323ef66
|
fix: 增加字数校验
|
2026-01-30 17:58:13 +08:00 |
|
|
|
6f429cf9c6
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-01-30 16:42:49 +08:00 |
|
|
|
2f893c8fd4
|
feat：增加校验
|
2026-01-30 16:42:40 +08:00 |
|
|
|
7581a337a7
|
解决冲突
|
2026-01-30 15:42:37 +08:00 |
|
|
|
0c930af71a
|
添加接口
|
2026-01-30 15:41:55 +08:00 |
|
|
|
d74cc74369
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-01-30 15:31:53 +08:00 |
|
|
|
c57b60230b
|
feat: 增加推荐人列表
|
2026-01-30 15:30:57 +08:00 |
|
jiaji.H
|
6ac8b2b1b4
|
Updata:解决冲突
|
2026-01-30 15:18:47 +08:00 |
|
|
|
295d26a35a
|
fix：修复子表没有uuid的问题
|
2026-01-30 15:17:38 +08:00 |
|
