Merge remote-tracking branch 'origin/master'

Junjie

3 天以前 2ed2c79a60bea2e05272f11324a0fd148414ae43

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

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

    private StationObjModel backStation;

    private StationObjModel dualCrnSlaveStation;

}