From 92bc6dca274eb45dc330f63b5a3f90a01458e157 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 27 五月 2025 14:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsStocktakingBound.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 103 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsStocktakingBound.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsStocktakingBound.java
new file mode 100644
index 0000000..38e4313
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsStocktakingBound.java
@@ -0,0 +1,103 @@
+package org.jeecg.modules.tms.entity;
+
+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.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 鐩樼偣鍗曡〃
+ * @Author: houjie
+ * @Date:   2025-05-16
+ * @Version: V1.0
+ */
+@ApiModel(value="tms_stocktaking_bound瀵硅薄", description="鐩樼偣鍗曡〃")
+@Data
+@TableName("tms_stocktaking_bound")
+public class ToolsStocktakingBound implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**涓婚敭*/
+    @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")
+    @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+    private java.util.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")
+    @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+    private java.util.Date updateTime;
+    /**鐩樼偣绫诲瀷*/
+    @Excel(name = "鐩樼偣绫诲瀷", width = 15)
+    @ApiModelProperty(value = "鐩樼偣绫诲瀷")
+    private Integer stocktakingType;
+    /**鐩樼偣鍗曞彿*/
+    @Excel(name = "鐩樼偣鍗曞彿", width = 15)
+    @ApiModelProperty(value = "鐩樼偣鍗曞彿")
+    private String orderCode;
+    /**缁忔墜浜�*/
+    @Excel(name = "缁忔墜浜�", width = 15)
+    @ApiModelProperty(value = "缁忔墜浜�")
+    @Dict(dicCode = "sys_user, realname, id")
+    private String handler;
+    /**瀹℃牳浜�*/
+    @Excel(name = "瀹℃牳浜�", width = 15)
+    @ApiModelProperty(value = "瀹℃牳浜�")
+    @Dict(dicCode = "sys_user, realname, id")
+    private String reviewer;
+    /**鐩樼偣鍚嶇О*/
+    @Excel(name = "鐩樼偣鍚嶇О", width = 15)
+    @ApiModelProperty(value = "鐩樼偣鍚嶇О")
+    private String stocktakingName;
+    /**澶囨敞*/
+    @Excel(name = "澶囨敞", width = 15)
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+    /**瀹℃牳鐘舵��*/
+    @Excel(name = "瀹℃牳鐘舵��", width = 15)
+    @ApiModelProperty(value = "瀹℃牳鐘舵��")
+    @Dict(dicCode = "approval_status")
+    private String approvalStatus;
+    /**瀹℃牳鎰忚*/
+    @Excel(name = "瀹℃牳鎰忚", width = 15)
+    @ApiModelProperty(value = "瀹℃牳鎰忚")
+    private String approvalOpinion;
+    /**鐩樼偣鏃堕棿*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鐩樼偣鏃堕棿")
+    private java.util.Date inventoryTime;
+
+
+    /**
+     * 瀹℃牳鏃堕棿
+     */
+    @Excel(name = "approvalDate", width = 20, format = "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 java.util.Date approvalDate;
+
+    @TableField(exist = false)
+    private List<ToolsStocktakingBoundDetail> toolsStocktakingBoundDetailList;
+}

--
Gitblit v1.9.3