From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java | 60 ++++++++++++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java
index b988d39..cf383c6 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.lsw.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,62 +15,57 @@
/**
* @Description: 绾胯竟搴撶墿鏂欎俊鎭�
* @Author: jeecg-boot
- * @Date: 2025-06-30
+ * @Date: 2025-06-30
* @Version: V1.0
*/
-@ApiModel(value="lsw_material瀵硅薄", description="绾胯竟搴撶墿鏂欎俊鎭�")
+@ApiModel(value = "lsw_material瀵硅薄", description = "绾胯竟搴撶墿鏂欎俊鎭�")
@Data
@TableName("lsw_material")
public class LswMaterial implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
private String id;
- /**鍒涘缓浜�*/
+ /**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ /**鍒涘缓鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
private Date createTime;
- /**鏇存柊浜�*/
+ /**鏇存柊浜�*/
@ApiModelProperty(value = "鏇存柊浜�")
private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ /**鏇存柊鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏇存柊鏃ユ湡")
private Date updateTime;
- /**鎵�灞為儴闂�*/
- @ApiModelProperty(value = "鎵�灞為儴闂�")
- private String sysOrgCode;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ /**鍒犻櫎鏍囪*/
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
- /**鐗╂枡缂栫爜*/
- @Excel(name = "鐗╂枡缂栫爜", width = 15)
+ /**鐗╂枡缂栫爜*/
@ApiModelProperty(value = "鐗╂枡缂栫爜")
private String materialNumber;
- /**鐗╂枡鍚嶇О*/
- @Excel(name = "鐗╂枡鍚嶇О", width = 15)
+ /**鐗╂枡鍚嶇О*/
@ApiModelProperty(value = "鐗╂枡鍚嶇О")
private String materialName;
- /**鐗╂枡鍨嬪彿*/
- @Excel(name = "鐗╂枡鍨嬪彿", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍨嬪彿")
- private String materialModel;
- /**鐗╂枡绫诲瀷*/
- @Excel(name = "鐗╂枡绫诲瀷", width = 15, dicCode = "material_category")
+ /**鐗╂枡绫诲瀷*/
@Dict(dicCode = "material_category")
@ApiModelProperty(value = "鐗╂枡绫诲瀷")
private String materialCategory;
- /**鍗曚綅*/
- @Excel(name = "鍗曚綅", width = 15)
- @ApiModelProperty(value = "鍗曚綅")
+ /**鍩烘湰璁￠噺鍗曚綅*/
+ @ApiModelProperty(value = "鍩烘湰璁￠噺鍗曚綅")
private String materialUnit;
+ /**鐗╂枡鐘舵��*/
+ @ApiModelProperty(value = "鐗╂枡鐘舵��")
+ private String materialStatus;
+
+ /** 鐗╂枡绫诲瀷鏄惁涓虹┖ */
+ @TableField(exist = false)
+ private boolean materialCategoryNull;
}
--
Gitblit v1.9.3