Commit Graph

1614 Commits

Author SHA1 Message Date
JNG
01753b9735 Merge branch 'jng' into dev 2026-02-03 16:46:46 +08:00
JNG
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
cjy
a92d70179e Merge branch 'feat-cjy-customerContract' into dev 2026-02-03 10:46:04 +08:00
cjy
adbe0abb2a fix:移除一些无用注释 2026-02-03 10:45:53 +08:00
JNG
aa772f6590 解决冲突 2026-02-03 10:19:01 +08:00
JNG
fa43fadae2 添加竞品数 2026-02-03 10:18:40 +08:00
JNG
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
jiaji.H
3bfd1007ee Updata:解决冲突 2026-02-02 20:02:35 +08:00
jiaji.H
c348409a73 Updata:更新数据创建 2026-02-02 20:00:28 +08:00
jiaji.H
171d6b04d3 Updata:解决冲突 2026-02-02 19:46:18 +08:00
jiaji.H
1f8fb4abf8 Updata:增加打印 2026-02-02 19:45:51 +08:00
jiaji.H
ae95c7dd4a Updata:增加字段 2026-02-02 19:40:10 +08:00
jiaji.H
88309279aa Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-02 18:01:51 +08:00
jiaji.H
7276a7d24e Updata:修改发票相关信息查询 2026-02-02 18:01:43 +08:00
JNG
57bfb779bd Merge branch 'jng' into dev 2026-02-02 17:54:30 +08:00
JNG
48e5d51373 Update bundleExtend.go 2026-02-02 17:54:24 +08:00
JNG
83a309152e Merge branch 'jng' into dev 2026-02-02 17:32:07 +08:00
JNG
0c8631e775 Update bundleExtend.go 2026-02-02 17:32:01 +08:00
JNG
8bea38c983 Merge branch 'jng' into dev 2026-02-02 16:55:51 +08:00
JNG
bbc0b97b30 Update bundleExtend.go 2026-02-02 16:55:45 +08:00
jiaji.H
5d9592b3e3 Updata:解决冲突 2026-02-02 16:45:45 +08:00
jiaji.H
01cb67feda Updata:更新字段 2026-02-02 16:36:59 +08:00
jiaji.H
66bffabfa0 Updata:解决冲突 2026-02-02 15:39:21 +08:00
jiaji.H
2b23495bce Updata:更新脚本导出字段 2026-02-02 15:38:45 +08:00
jiaji.H
ed8a22b0fd Updata:解决冲突 2026-02-02 15:28:26 +08:00
jiaji.H
8a32b28680 Updata:更新pb文件 2026-02-02 15:27:58 +08:00
jiaji.H
1ffdb284ec Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-02 15:24:56 +08:00