From c99438c64037b06c629e37f1f1acb5ce48a31036 Mon Sep 17 00:00:00 2001
From: 17808 <1780814303@qq.com>
Date: 星期三, 13 九月 2023 13:05:38 +0800
Subject: [PATCH] Merge branch 'lyl-dev'

---
 ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java b/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java
index 55c8098..ddcc447 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java
@@ -19,7 +19,7 @@
     private String departTypeName;
 
     @ExcelProperty(value = "閮ㄩ棬绫诲瀷", index = 2)
-    private Integer departType;
+    private String departType;
 
     @ExcelProperty(value = "涓婄骇閮ㄩ棬", index = 3)
     private String parentDepartName;

--
Gitblit v1.8.0