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

云

2 天以前 23c8604bc54ba3f20b0bf00a2649895c8e096a05

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

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

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

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

    @Schema(description = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;