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

whycq

2024-09-26 19c4282ae9bad01293a7d4a4d5fe572fbc742c18

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

@@ -515,4 +515,12 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
    }

    public Integer getIoTypeMes$(){
        if (this.ioType != 101){
            return 3;
        } else {
            return 1;
        }
    }

}