weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

Browse Source
This commit is contained in:
赵辉
2025-12-10 09:28:06 +08:00
parent 7b10ff2b25 1b8a0eb8a4
commit df299a21ae
158 changed files with 4032 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_transport/src/main/resources/bootstrap.yml
+6 -4
View File
@@ -18,13 +18,15 @@ spring:
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
# server-addr: 127.0.0.1:8848
# 线上测试环境配置使用ip+端口号
#server-addr: 10.33.0.129:6000
# server-addr: 10.33.0.129:6010r
server-addr: 10.33.0.129:6010
config:
server-addr: 127.0.0.1:8848
# server-addr: 127.0.0.1:8848
# 线上测试环境配置使用ip+端口号
#server-addr: 10.33.0.129:6000
# server-addr: 10.33.0.129:6010
server-addr: 10.33.0.129:6010
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml
+3 -3
View File
@@ -33,12 +33,12 @@
i.material_id,
m.category AS material_category,
m.name AS material_name,
m.model AS material_model,
m."MODEL" AS material_model,
i.quantity,
m.unit,
m.weight,
m.code_managed,
m.value,
m."VALUE",
i.machine_serial_no,
i.created_at
FROM
@@ -91,7 +91,7 @@
i.material_id,
m.category AS material_category,
m.name AS material_name,
m.model AS material_model,
m."MODEL" AS material_model,
i.quantity,
m.unit,
m.weight,