From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaCommonToolVo.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaCommonToolVo.java
index b68c4f8..a01e7d7 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaCommonToolVo.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaCommonToolVo.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 
 import java.io.Serializable;
 
@@ -30,6 +31,9 @@
 
     @ApiModelProperty(value = "宸ュ叿缂栧彿")
     private String toolId;
+
+    @ApiModelProperty(value = "宸ュ叿id")
+    private String toolCodeId;
 
     @ApiModelProperty(value = "搴忓彿锛堟垨浼佷笟鍐呯爜锛�")
     private String signCode;
@@ -56,7 +60,9 @@
     private String positionCode;
 
     @ApiModelProperty(value = "宸ュ叿绫诲瀷;1.閫氱敤 2.涓撶敤")
+    @Dict(dicCode = "application_type")
     private String applicationType;
+    private String applicationTypeName;
 
     @ApiModelProperty(value = "鍘傚")
     private String supplierId;
@@ -88,4 +94,7 @@
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
+    @ApiModelProperty(value = "宸ュ叿鍥剧墖")
+    private String toolPicture;
+
 }

--
Gitblit v1.9.3