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

luxiaotao1123

2020-09-28 5090e469d6428e4508db52b49b4e34d9ba6198ea

 src/main/java/com/zy/core/model/DevpSlave.java

@@ -21,6 +21,8 @@

    private List<Sta> inSta = new ArrayList<>();

    private List<Sta> emptyInSta = new ArrayList<>();

    private List<Sta> outSta = new ArrayList<>();

    private List<Sta> pickSta = new ArrayList<>();