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

liujie

9 天以前 9ba5a2a253535df55ba7e630f5f29adf45c6e9c9

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

@@ -10,6 +10,9 @@
@ApiModel(value = "erp商品库存信息查询参数query")
public class TErpGoodsQuery extends BasePage {

    @ApiModelProperty(value = "供应商名称")
    private String supplierName;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;