Merge remote-tracking branch 'origin/master'

xuhy

8 天以前 433bc1e314ecfd483379ca0e2e74e7c815d3261f

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

@@ -19,9 +19,10 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "盘点单号")
    @ApiModelProperty(value = "采购单号")
    private String inventoryNumber;


    @ApiModelProperty(value = "入库商品")
    private List<TErpClinicWarehousingBatch> list;
}