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

lty

昨天 01fa93b5dd9f20286ef8f22515caf55307f76a9d

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

@@ -35,6 +35,9 @@

    private Double anfme;

    //机台
    private String devNo;

    public DetlDto() {
    }