Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-06 84723e8640dfdeb6e70d62edbad539bf47ac4cd6

 UI-Project/src/lang/zh.js

@@ -219,6 +219,7 @@
        team:'班组',
        basic:'设备',
        add:'确认保存',
        cancel:'取消',
    },
    workOrder:{
        glassID:'玻璃ID',
@@ -236,6 +237,7 @@
        takemessage:'是否拿走该条信息？',
        breakage:'破损',
        takeout:'拿走',
        glasstype:'玻璃类型',
    },
    processCard:{
        intofurnace:'进炉中',