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

lty

昨天 01fa93b5dd9f20286ef8f22515caf55307f76a9d

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

@@ -18,4 +18,10 @@

    private Integer workNo;

    private Integer taskNo;

    private String barcode;

    private Integer taskPri;

}