From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java
index bf4ad39..0addb59 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java
@@ -1,13 +1,11 @@
package com.panzhihua.common.model.dtos.shop;
+import java.math.BigDecimal;
+
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.NumberFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.Date;
+import lombok.Data;
/**
* @description: 商城订单导出
@@ -32,6 +30,5 @@
@ExcelProperty("收支类型")
private String type;
-
}
--
Gitblit v1.7.1