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

liyong

昨天 33f9eae4ad4321860e4881f5f38dad6368c878ef

 src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java

@@ -97,7 +97,6 @@
    /**
     * 入库时间
     */
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDateTime createTime;