Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

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

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

    private String supplierClinicId;

}