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

Junjie

7 天以前 637e8436a33cbc4ea04d4fc68763debaba8412c4

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

@@ -303,7 +303,7 @@
        if (!Cools.isEmpty(kcztMap)){
            return String.valueOf(kcztMap.getVname());
        }
        return this.cstateid;
        return String.valueOf(this.cstateid);
    }

}