|
|
c7cbe76848
|
fix: 调整创建订单的uuid
|
2026-02-04 12:18:07 +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 |
|
|
|
ac9bee2a83
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-02-04 11:26:46 +08:00 |
|
|
|
6ef896b009
|
fix: rizhi
|
2026-02-04 11:26:30 +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
|
ef3dd698e5
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 10:46:45 +08:00 |
|
jiaji.H
|
deaac40fad
|
Updata：更新发票时间检索
|
2026-02-04 10:46:38 +08:00 |
|
|
|
f67a75d173
|
fix: 改GetOrderNo
|
2026-02-04 10:41:20 +08:00 |
|
|
|
f962487e19
|
fix: 改GetOrderNo
|
2026-02-04 10:32:08 +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 |
|
jiaji.H
|
fe4357f246
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 09:48:32 +08:00 |
|
jiaji.H
|
18e341edce
|
Updata：更新时间排序
|
2026-02-04 09:48:07 +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 |
|
|
|
01753b9735
|
Merge branch 'jng' into dev
|
2026-02-03 16:46:46 +08:00 |
|
|
|
4f3fcb8206
|
修改
|
2026-02-03 16:46:33 +08:00 |
|
jiaji.H
|
90362ac91e
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 16:04:32 +08:00 |
|
jiaji.H
|
d9b425bba1
|
Updata：增加不太类型时间格式兼容
|
2026-02-03 16:04:23 +08:00 |
|
jiaji.H
|
e5ced3709e
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 15:44:25 +08:00 |
|
jiaji.H
|
275ee0376f
|
Updata：更新sql
|
2026-02-03 15:44:10 +08:00 |
|
jiaji.H
|
1bfe928434
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 15:00:40 +08:00 |
|
jiaji.H
|
be45f91971
|
Updata：修改时间解析
|
2026-02-03 15:00:32 +08:00 |
|
jiaji.H
|
8e4fd35b8d
|
Updata：解决冲突
|
2026-02-03 14:30:54 +08:00 |
|
jiaji.H
|
c149bc1af5
|
Updata：更新时间解析
|
2026-02-03 14:30:26 +08:00 |
|
jiaji.H
|
0c0ec5f61d
|
Updata：增加log
|
2026-02-03 14:13:04 +08:00 |
|
jiaji.H
|
7df8cfa8cb
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:59:56 +08:00 |
|
jiaji.H
|
b8dcfafe7e
|
Updata：列表倒叙排序
|
2026-02-03 13:59:49 +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 |
|
jiaji.H
|
98ab8f5ffb
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:18:01 +08:00 |
|
jiaji.H
|
24423900d3
|
Updata:更新检索sql
|
2026-02-03 13:17:48 +08:00 |
|
jiaji.H
|
455d09f14a
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:11:22 +08:00 |
|
jiaji.H
|
40bd33d19c
|
Updata:修正sql
|
2026-02-03 13:11:14 +08:00 |
|
|
|
a92d70179e
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-03 10:46:04 +08:00 |
|
|
|
adbe0abb2a
|
fix:移除一些无用注释
|
2026-02-03 10:45:53 +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
|
14d0465e6d
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 09:26:41 +08:00 |
|
jiaji.H
|
420a169c65
|
Updata：完善检索逻辑
|
2026-02-03 09:26:26 +08:00 |
|
jiaji.H
|
83d682b8af
|
Updata:解决冲突
|
2026-02-02 20:44:52 +08:00 |
|
jiaji.H
|
dfd82b87b8
|
Updata：更新log
|
2026-02-02 20:43:49 +08:00 |
|
jiaji.H
|
34fbe7a3d9
|
Updata：增加log
|
2026-02-02 20:30:33 +08:00 |
|
jiaji.H
|
e53e2963a6
|
Updata：增加数据打印
|
2026-02-02 20:30:03 +08:00 |
|
