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

zjj

3 天以前 11e2b6d43b6c1664f74963649dad9507db34c6ae

 src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java

@@ -12,5 +12,7 @@
    private String orderType;
    private String date;
    private String warehouse;
    private String mark;
    private String workNo;

}