From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java b/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java
index 40a5f9a..686088e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java
@@ -48,6 +48,10 @@
     @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
     private Integer isdeleted;
 
+    @ApiModelProperty(value = "缁戝畾绫诲瀷锛�0=瀛愭柟妗堬紱1=涓绘柟妗�", example = "1")
+    @ExcelColumn(name="缁戝畾绫诲瀷锛�0=瀛愭柟妗堬紱1=涓绘柟妗�")
+    private Integer type;
+
     @ApiModelProperty(value = "澶囨敞")
     @ExcelColumn(name="澶囨敞")
     private String remark;

--
Gitblit v1.9.3