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

maven

5 天以前 577fd97c572af76ac2464543e74e7edc2c35ffa0

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

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

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

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