Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

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

@@ -24,4 +24,6 @@
    @NotBlank(message = "商品id不能为空")
    private String goodsId;

    private String supplierClinicId;

}