Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2023-09-18 36f2cc9971f3bf82c193c7657751a88722eb32b9

 WarM/仓库管理/Gy_BarCodeBill_ChaiMa.resx

@@ -422,4 +422,7 @@
        TkSuQmCC
</value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>61</value>
  </metadata>
</root>