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

廖井涛

2025-09-03 82bd97c5a0e05c936f62acf28ac4969b351b6d59

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

@@ -382,7 +382,7 @@
        TrademarkAttribute:'商标参数',
        TrademarkOptions:'商标选项',
        xImage:'X轴镜像',
        yImage:'y轴镜像',
        yImage:'Y轴镜像',
        modifyTrademark:'修改商标',
        tag:'打标使能',
        tag2:'二维码打印1',
@@ -391,7 +391,9 @@
        yMargin:'高方向坐标',
        location:'商标位置',
        sort:'玻璃反弯',
        archRise:'拱高'
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',

    },