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

lty

昨天 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/java/com/zy/common/model/TaskDto.java

@@ -40,6 +40,7 @@
        this.deviceNo = deviceNo;
    }


    public TaskDto(String locNo, Integer staNo, LocDto locDto) {
        this.locNo = locNo;
        this.staNo = staNo;