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

liyong

9 天以前 cf17e9b3e34d1f14f5b9ed41e4eeb82c744cb218

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

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

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