Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-10 78809560f4315777e770acec0e24cb42e2ca97a7

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

@@ -61,6 +61,8 @@
            max255:"最多输入255个字符",
            range99999Dec2:
                "请输入0-99999之间的数字，最多保留两位小数",
            range999999Dec2:
                "请输入0-999999之间的数字，最多保留两位小数",
            greater0:"请输入大于0的整数",
            checkoutLose:'校验不通过',
            saveSuccess:'保存成功',
@@ -393,7 +395,7 @@
        halfProductLabel:'半品标签',
        pleaseSelectCustomPrintLabelStyle:'请选择自定义打印标签样式',
        mergePrinting:'合并打印',
        printStatus:'打印状态',
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        addAutomatically:'自动填充',
        selectFill:'选中填充'