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

野心家

2023-05-22 fe1801f4f3b9a3e2c9c0a7c1b004a9345be1b446

 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<>();