Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs# Conflicts:# src/main/resources/application.yml
src/main/resources/application.yml @@ -297,6 +297,7 @@ pickSta[7]: staNo: 304 barcode: ${wcs-slave.barcode[7].id} # 条码扫描仪1 barcode[0]: id: 1
