Merge branch 'dev_New_pro' into dev_天津_中兴实强

云

6 天以前 974b553211485da3634f8ff0e3ecb1eb61881e2d

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

@@ -43,6 +43,9 @@
    @Schema(description = "备注")
    private String remark;

    @Schema(description = "预警数量")
    private BigDecimal warnNum;

    @Schema(description = "类型  0合格入库 1不合格入库")
    private String type;