Merge remote-tracking branch 'origin/master'

wangfei

2025-03-14 dacf6715218c6061d53220b456c75a559bc5af8f

 UI-Project/src/lang/zh.js

@@ -317,7 +317,7 @@
          takemessage:'是否拿走该条信息？',
          breakage:'破损',
          takeout:'拿走',
          glasstype:'玻璃类型',
          glasstype:'玻璃膜系',
          line:'线路',
          status:'状态',
          time:'时间段',
@@ -709,6 +709,12 @@
          finegrinding: '精磨',
      },
    hellow: {
        totalLayer: '总层数',
        totalPairQuantity: '总配对数量',
        pairQuantity: '已完成配对数量',
        isForceList: '是否强制',
        yesisForceList: '强制',
        noisForceList: '非强制',
        hollowCountOutOne: '中空一线玻璃数量',
        hollowCountOutTwo: '中空二线玻璃数量',
        hollowTotalAreaOutOne: '中空一线玻璃面积',