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

czkh

2 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

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