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

whycq

2023-01-08 30b2d8dde49639824f2a9c8f5b3e9b99b4b09e80

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

@@ -131,9 +131,9 @@
    private String error;

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

    /**
@@ -388,7 +388,7 @@
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "未处理";
                return "待处理";
            case 2:
                return "已修复";
            default: