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

luxiaotao1123

2020-09-28 5090e469d6428e4508db52b49b4e34d9ba6198ea

 src/main/java/com/zy/core/properties/SlaveProperties.java

@@ -29,4 +29,6 @@

    private List<Slave> scale = new ArrayList<>();

    private List<Slave> car = new ArrayList<>();

}