From cc80794e556bbe1e43f9c1369e1dfc9c61318fda Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 07 三月 2024 14:57:10 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index d16e430..3f3f823 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -28,13 +28,10 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
private String creator;
-
-
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
private String edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -51,10 +48,9 @@
@ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
private Integer memberId;
+
@ApiModelProperty(value = "璁惧缂栫爜", example = "1")
private Integer deviceId;
-
-
@ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
private Integer importStatus;
@@ -70,11 +66,14 @@
private Integer cancelUserId;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelDate;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
private String cancelInfo;
+
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @TableField(exist = false)
+ private String deviceName;
@ApiModelProperty(value = "鎵�灞炲叕鍙哥紪鐮�")
@TableField(exist = false)
@@ -109,8 +108,7 @@
private Date endTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鎿嶄綔浜�")
@@ -128,11 +126,9 @@
@ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂" )
private Integer sendType;
-
-
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendDate;
@ApiModelProperty(value = "涓嬪彂澶囨敞")
--
Gitblit v1.9.3