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

liyong

4 天以前 da0e9fff7f8ba1bd163836240ebb9935fa5c25ef

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

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

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

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