From 078a5c4ced367fdbd5a16c27c8bada6e44e632d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:00:33 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
index 11d4da6..8faea00 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
@@ -23,6 +23,7 @@
 public class WarningPush  extends LoginUserModel {
 
     @ApiModelProperty(value = "涓婚敭", example = "1")
+    @TableId(type = IdType.AUTO)
     //@ExcelColumn(name="涓婚敭")
     private Integer id;
 
@@ -31,7 +32,7 @@
     private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍙戠敓浜嬩欢",dateFormat = "yyyy-MM-dd HH:mm:ss",index = 1)
+    @ExcelColumn(name="鍙戠敓浜嬩欢",dateFormat = "yyyy-MM-dd HH:mm:ss",width=10,index = 1)
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -67,7 +68,7 @@
     private String content;
 
     @ApiModelProperty(value = "鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�", example = "1")
-    @ExcelColumn(name="閫氱煡鐘舵��",valueMapping = "0=鏈�氱煡;1=閫氱煡鎴愬姛;2=閫氱煡澶辫触;",index = 7)
+    @ExcelColumn(name="閫氱煡鐘舵��",valueMapping = "0=鏈�氱煡;1=閫氱煡鎴愬姛;2=閫氱煡澶辫触;",width=10,index = 8)
     private Integer status;
 
     @ApiModelProperty(value = "鎺ㄩ�佺粨鏋�", example = "1")
@@ -82,7 +83,7 @@
     //@ExcelColumn(name="鎺ㄩ�佹爣璇�")
     private String pushId;
     @ApiModelProperty(value = "鎺ㄩ�佹爣璇�")
-    @ExcelColumn(name="鎵�鍦ㄤ綅缃�",index = 5)
+    @ExcelColumn(name="鎵�鍦ㄤ綅缃�",width=10,index = 5)
     private String region;
 
     @ApiModelProperty(value = "鎺ㄩ�佹椂闂�")
@@ -94,31 +95,33 @@
     private Integer pushType;
 
     @ApiModelProperty(value = "浜嬩欢鍒嗙被 0=瀹夐槻浜嬩欢锛�1=娑堥槻浜嬩欢锛�2=杞﹁浇浜嬩欢锛�3=閽ュ寵鏌滀簨浠讹紱 4=澶╂皵棰勮锛�", example = "1")
-    @ExcelColumn(name="浜嬩欢鍒嗙被",valueMapping = "0=瀹夐槻浜嬩欢;1=娑堥槻浜嬩欢;2=杞﹁浇浜嬩欢;3=閽ュ寵鏌滀簨浠�;4=澶╂皵棰勮;",index = 3)
+    @ExcelColumn(name="浜嬩欢鍒嗙被",valueMapping = "0=瀹夐槻浜嬩欢;1=娑堥槻浜嬩欢;2=杞﹁浇浜嬩欢;3=閽ュ寵鏌滀簨浠�;4=澶╂皵棰勮;",width=10,index = 3)
     @TableField(exist = false)
     private Integer warningType;
     @ApiModelProperty(value = "浜嬩欢绫诲瀷", example = "1")
-    @ExcelColumn(name="浜嬩欢绫诲瀷",index = 2)
+    @ExcelColumn(name="浜嬩欢绫诲瀷",width=10,index = 2)
     @TableField(exist = false)
     private String warningName;
     @ApiModelProperty(value = "浜嬩欢绛夌骇 0浣� 1涓� 2楂�", example = "1")
-    @ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",index = 4)
+    @ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",width=10,index = 4)
     @TableField(exist = false)
     private Integer warningLevel;
     @ApiModelProperty(value = "閫氱煡浜哄憳", example = "1")
-    @ExcelColumn(name="閫氱煡浜哄憳",index = 6)
+    @ExcelColumn(name="閫氱煡浜哄憳",width=10,index = 6)
     @TableField(exist = false)
     private String memberName;
+    @ApiModelProperty(value = "浜哄憳閮ㄩ棬", example = "1")
+    @ExcelColumn(name="浜哄憳閮ㄩ棬",width=10,index = 7)
+    @TableField(exist = false)
+    private String companyName;
 
 
 
-    @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮�  ")
     @TableField(exist = false)
     private Date queryStarttime;
 
-    @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫  ")
     @TableField(exist = false)
     private Date queryEndtime;
 

--
Gitblit v1.9.3