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

1

2 天以前 d5eb955933d4c7dc1f102d8a688f7447b5a674fd

 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);