Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-07-04 0c6cb039b176207d9568b8658f59725b378434e9

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -125,7 +125,7 @@
           glassRepeat:'请先选择间隔物',
           HollowReview:'请选择全部中空间隔物下拉框',
           firstGlass:"请先选择产品",
           InterlayerReview:'请选择全部中空间隔物下拉框',
           InterlayerReview:'请选择全部间隔物带星号下拉框',
           glassTypeTitle:'材料属性',
           thickness:'*厚度',
           color:'*颜色',
@@ -141,7 +141,7 @@
           hollowUpdate:'中空间隔物修改',
           interlayerThickness:'*夹层厚度',
           interlayerType:'*类型',
           interlayerColor:'*颜色',
           interlayerColor:'颜色',
           interlayer:'夹层间隔物',
           interlayerUpdate:'夹层间隔物修改',
           glassAttribute:'单片玻璃属性:',