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

zss

8 天以前 461fcac5e3089c4ba48e6e43b6bb88a88a1070d8

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

@@ -37,6 +37,9 @@
    @NotBlank(message = "不能为空")
    private Long productModelId;

    @Schema(description = "批号")
    private String batchNo;

    @Schema(description = "数量")
    private BigDecimal qualitity;