From 71fba5328a35b449b11088e540932787220f91d8 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期三, 18 六月 2025 17:28:50 +0800 Subject: [PATCH] 1.生产加工变更库存回滚 2.巡检,档案上传完善 --- ruoyi-common/src/main/java/com/ruoyi/basic/entity/StorageAttachment.java | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/basic/entity/StorageAttachment.java b/ruoyi-common/src/main/java/com/ruoyi/basic/entity/StorageAttachment.java index dddde62..44b750d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/basic/entity/StorageAttachment.java +++ b/ruoyi-common/src/main/java/com/ruoyi/basic/entity/StorageAttachment.java @@ -1,13 +1,13 @@ package com.ruoyi.basic.entity; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.basic.entity.dto.StorageBlobDTO; import lombok.Data; -import com.ruoyi.common.core.domain.BaseEntity; import java.io.Serializable; -import java.util.Date; /** * 閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭� 瀹炰綋绫� @@ -26,16 +26,24 @@ */ @TableId(value = "id", type = IdType.AUTO) private Long id; +// +// /** +// * 鍒涘缓鏃堕棿 +// */ +// @TableField(value = "create_time", +// fill = FieldFill.INSERT, +// typeHandler = LocalDateTimeTypeHandler.class) +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// private LocalDateTime createTime; - /** 鍒涘缓鏃堕棿 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - /** 鏇存柊鏃堕棿 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; +// /** +// * 鏇存柊鏃堕棿 +// */ +// @TableField(value = "update_time", +// fill = FieldFill.INSERT_UPDATE, +// typeHandler = LocalDateTimeTypeHandler.class) +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// private LocalDateTime updateTime; /** * 閫昏緫鍒犻櫎 @@ -63,6 +71,7 @@ @TableField(value = "storage_blob_id") private Long storageBlobId; + @TableField(exist = false) private StorageBlobDTO storageBlobDTO; public StorageAttachment(String fileType, Long recordType, Long recordId) { -- Gitblit v1.9.3