Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-05 2659d91f6f796731441ba6f372a52692142705b1

 UI-Project/src/lang/zh.js

@@ -234,6 +234,8 @@
          cancel:'取消',
          temperingtotal:'钢化炉数：',
          glasstotal:'玻璃总数：',
          Labelprinting:'标签打印',
          Schedulingswitch:'调度开关',
      },
      workOrder:{
          glassID:'玻璃ID',
@@ -668,5 +670,6 @@
        forcedfilming: '强制出片',
        pforcedfilming: '是否强制出片？',
        brokenpieces: '破损片数',
        realpieces: '实际片数',
    }
}