Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs

1

5 天以前 ccdcd79a48aabb15d9ce9525a3535c01e69475c8

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

@@ -20,6 +20,7 @@
    private Integer slot;

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

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