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

liujie

5 天以前 f8d30932873605f5eb407228b22a38ec5ff96af9

 ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsInventoryQuery.java

@@ -33,6 +33,8 @@
    @NotBlank(message = "仓库id不能为空")
    private String warehouseId;

    @ApiModelProperty(value = "有效期预警 出库使用 条件1  其他不传")
    private Integer type;


}