Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2025-10-17 9ba5a2a253535df55ba7e630f5f29adf45c6e9c9

 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;