Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

luxiaotao1123

2020-09-28 5090e469d6428e4508db52b49b4e34d9ba6198ea

 src/main/resources/application.yml

@@ -29,7 +29,7 @@
#    field-strategy: 0

logging:
  path: /stock/out/wcs/logs
  path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: xltys1995
@@ -85,7 +85,7 @@
  # 条码扫描仪
  barcode[0]:
    id: 1
    ip: 192.168.10.150
    ip: 192.168.6.150
    port: 51236
  # 台车
  car[0]: