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

zss

3 天以前 aa3d1a0d6e0211ebd4c85a5ebd3847f64c59b4ac

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

@@ -62,4 +62,7 @@

    @ApiModelProperty("预警数量")
    private Integer warnNum;

    @ApiModelProperty("备注")
    private String remark;
}