Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

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

@@ -29,6 +29,9 @@
    @ApiModelProperty(value = "库存管理条件 不足传1")
    private Integer type;

    @ApiModelProperty(value = "1入库 其他不传")
    private Integer category;

    @ApiModelProperty(value = "供应商id/诊所id")
    private String supplierClinicId;
}