From b437ca4b3ba3fadc821e4b01398c3257e540fcb7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 14:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
index 4f9b1e8..5011515 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
@@ -29,8 +29,8 @@
     @ExcelColumn(name="浣跨敤鏈堜唤",index = 2,dateFormat="yyyy-MM",width = 10)
     private Date timeInfo;
 
-    @ApiModelProperty(value = "绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补", example = "1")
-    @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;",index = 0,width = 10)
+    @ApiModelProperty(value = "绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补 3鐑熺", example = "1")
+    @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;3=鐑熺;",index = 0,width = 10)
     private Integer type;
 
     @ApiModelProperty(value = "鏁伴噺 (鐢ㄧ數椤匡紝鐢ㄧ數搴︼紱 娌硅�桳锛�", example = "1")

--
Gitblit v1.9.3