From e40a072541e1b31add7ed345e47adf61c49ecf4f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 13 十月 2023 09:05:39 +0800
Subject: [PATCH] #获取可退款信息

---
 server/services/src/main/java/com/doumee/dao/business/model/Locks.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
index 85ba04c..7d56295 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,7 +27,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +36,7 @@
 
     @ApiModelProperty(value = "缂栬緫鏃堕棿")
     @ExcelColumn(name="缂栬緫鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "缂栬緫浜�")
@@ -58,8 +59,8 @@
     @ExcelColumn(name="缂栧彿")
     private String code;
 
-    @ApiModelProperty(value = "鐘舵�� 0姝e父 1寮傚父", example = "1")
-    @ExcelColumn(name="鐘舵�� 0姝e父 1寮傚父")
+    @ApiModelProperty(value = "鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父", example = "1")
+    @ExcelColumn(name="鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父")
     private Integer status;
 
     @ApiModelProperty(value = "绔欑偣缂栫爜(鍏宠仈sites)")
@@ -69,5 +70,8 @@
     @ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
     @ExcelColumn(name="褰撳墠閿佸畾鑷杞︾紪鍙�")
     private String bikeCode;
+    @ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
+    @TableField(select = false)
+    private Sites sites;
 
 }

--
Gitblit v1.9.3