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

zhang

2 天以前 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c

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

@@ -15,6 +15,8 @@
    private List<MatList> matList; // 木箱集合
    //1一厂平库 2 一厂立库 3二厂平库 4二厂立库
    private Integer warehouseType ;
    private String groupOrderNumber; //组货单号

    @Data
    public static class MatList{
        private String boxPos; // 箱子位置