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

云

4 天以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

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

@@ -50,7 +50,6 @@
    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;