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

ZengTao

2025-03-07 df13b23a2fa3519e6f796ed946d87412a6a5f7ca

 UI-Project/src/lang/zh.js

@@ -138,7 +138,6 @@
          cagesnumber:'笼内数量',
          slotnumber:'占有格子数',
          progress:'进度',
          temperingpriority:'钢化优先级',
          whethersame:'是否相同',
          same:'相同',
          notsame:'不相同',
@@ -560,8 +559,9 @@
          broke :'破损',
          takeout :'拿走',
          dreportwork :'未报工',
          pendingwork :'待报工',
          pendingwork :'已现补',
          reportwork :'已报工',
          reportworked :'已同步',
          incise :'切割',
          edging :'磨边',
          steel :'钢化',