Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

10 天以前 350dcd77ee343e81e815279f82c964a1dd466a4d

 src/main/java/com/ruoyi/stock/pojo/StockInventory.java

@@ -56,6 +56,4 @@
    @ApiModelProperty("预警数量")
    private Integer warnNum;

    @ApiModelProperty("租户id")
    private Integer tenantId;
}