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

lty

昨天 4bb523147bc6e9fef20142d1389c893f97321e02

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

@@ -351,6 +351,10 @@
        return null;
    }

    public long getWrkSts(){
        return (long)this.wrkSts;
    }

    public String getIoType$(){
        BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
        BasWrkIotype basWrkIotype = service.selectById(this.ioType);