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

yaowanxin

20 小时以前 2be90eb75452c8f0820d89cb1cd018dd86a351e0

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

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