Merge remote-tracking branch 'origin/master'

mitao

昨天 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

 ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java

@@ -8,7 +8,6 @@

import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

@Data
@@ -32,7 +31,7 @@
    private String remarks;

    @ApiModelProperty(value = "采购物品清单")
    private PageInfo<GrabListVO> grabListVOPageInfo;
    private PageInfo<StorageListVO> grabListVOPageInfo;
    @ApiModelProperty(value = "审批流程")
    private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;