Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-versi...

zwl

2 天以前 3efe34fdc1dfe58e16c8689faf086b38b2d73e83

 src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java

@@ -41,6 +41,9 @@
    //报警
    private Integer error;

    //报警信息
    private String errorMsg;

    //条码
    private String barcode;