From ba615e67d8061233d8e2eeac6d540853e99eff34 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 二月 2025 09:59:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java
index 39c3e43..a3c694e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java
@@ -31,7 +31,7 @@
 
     @ColumnWidth(20) // 定义列宽
     @ExcelProperty(value = {"服务时长"}, index = 5)
-    private Integer serviceTime;
+    private Double serviceTime;
 
     @ColumnWidth(20) // 定义列宽
     @ExcelProperty(value = {"累计积分"}, index = 6)

--
Gitblit v1.7.1