Merge remote-tracking branch 'origin/master'

Junjie

1 天以前 a840ef6aa8f89075cbaee87973cdece12e370a28

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

@@ -26,6 +26,4 @@

    private StationObjModel backStation;

    private StationObjModel dualCrnSlaveStation;

}