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

Administrator

7 天以前 aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2

 src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java

@@ -120,7 +120,7 @@
    private String err;

    /**
     * 异常情况 1: 未处理  2: 已修复  
     * 异常情况 1: 未处理  2: 已修复
     */
    @ApiModelProperty(value = "异常情况 1: 未处理  2: 已修复  ")
    private Integer status;