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

taisheng

7 天以前 a5fd6b72f8342f0228321849b04c822feba2d2a0

 src/main/java/com/zy/common/model/MapNode.java

@@ -37,6 +37,10 @@

    private Integer bay;

    private String locSts;

    private String locNo;

    //节点被锁定时所属设备号
    private Integer lockDeviceNo;