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

taisheng

10 天以前 a5fd6b72f8342f0228321849b04c822feba2d2a0

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

@@ -27,4 +27,6 @@

    private List<ForkLiftSlave> forkLift = new ArrayList<>();

    private List<ForkLiftSlave> forkLiftMaster = new ArrayList<>();

}