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

liyong

4 天以前 cf77dd834b5c4f6b75aea748ba3f1d812de8414c

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

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

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

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