From 535d727d1453d61da28fed8bb90e0335316c7f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 21 Feb 2024 17:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cardFule/vo/CardFuelRecordCount.java         | 16 ++++++++++++++++
 .../cardGift/entity/CardGift.java                |  5 +++++
 .../fuint/common/shiroConfig/ShiroConfig.java    |  1 +
 3 files changed, 22 insertions(+)
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelRecordCount.java

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelRecordCount.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelRecordCount.java
new file mode 100644
index 000000000..cdc51832a
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelRecordCount.java
@@ -0,0 +1,16 @@
+package com.fuint.business.marketingActivity.cardFule.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CardFuelRecordCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String oilName;
+    private Integer peoples;
+    private Double money;
+    private Double litres;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/entity/CardGift.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/entity/CardGift.java
index c25ab93ef..6db5a2eec 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/entity/CardGift.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/entity/CardGift.java
@@ -1,6 +1,8 @@
 package com.fuint.business.marketingActivity.cardGift.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -18,6 +20,7 @@ import java.util.Date;
  */
 @SuppressWarnings("serial")
 @Data
+@ExcelIgnoreUnannotated
 public class CardGift extends Model<CardGift> {
     //主键id
     @TableId(type = IdType.AUTO)
@@ -26,9 +29,11 @@ public class CardGift extends Model<CardGift> {
     private String batchNumber;
     //卡号
     @ExcelProperty(value = "卡号")
+    @ColumnWidth(30)
     private String number;
     //卡密
     @ExcelProperty(value = "卡密")
+    @ColumnWidth(20)
     private String cardPassword;
     //所属连锁店id
     private Integer chainStorId;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
index 9b8e563a5..37cb0c971 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
@@ -37,6 +37,7 @@ public class ShiroConfig {
         filterMap.put("/backendApi/login/loginByPhone","anon");
         filterMap.put("/backendApi/login/getInfo","anon");
         filterMap.put("/backendApi/login/logout","anon");
+        filterMap.put("/business/marketingActivity/cardGift/export","anon");
         /*filterMap.put("/business/largeSscreen","anon");
         filterMap.put("/business/largeSscreen/goods","anon");
         filterMap.put("/business/largeSscreen/staff","anon");