Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

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

@@ -35,7 +35,7 @@
    @ApiModelProperty(value = "入库时间")
    private LocalDateTime warehouseTime;

    @ApiModelProperty(value = "入库类型 1采购  2盘点")
    @ApiModelProperty(value = "入库类型 1采购  2盘点  3手动")
    private Integer type;