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

Junjie

2023-03-27 22d9b27f913cc47d54b361870f62aa81b4c8fd85

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

@@ -25,7 +25,9 @@

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

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

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

    @Data
    public static class Sta {