From 1e22fd4f9b5e1e6beb95d68a74c0311f2300762a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 17 十月 2023 18:24:33 +0800
Subject: [PATCH] 111

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

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
index 244f5ec..38750a2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 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 = "缂栬緫浜�")
@@ -44,6 +45,7 @@
 
     @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
     @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+    @TableLogic
     private Integer isdeleted;
 
     @ApiModelProperty(value = "鍚嶇О")
@@ -52,12 +54,12 @@
 
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     @ExcelColumn(name="寮�濮嬫椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     @ExcelColumn(name="缁撴潫鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
     @ApiModelProperty(value = "浼樺厛绾э紙鍗囧簭锛�", example = "1")

--
Gitblit v1.9.3