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

zss

6 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

 src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java

@@ -9,8 +9,7 @@
@Data
public class WarehouseGoodsShelvesRowcolDto extends WarehouseGoodsShelvesRowcol {
    private String warehouseName;
    private String goodsShelvesName;
    private String docName;
    private String docNumber;
    private String name;
    private List<DocumentationDto> documentationDtoList;
    private String category;
}