From 275cc504242a476b88892395f020be15f7b75d0c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 22 十二月 2025 14:59:32 +0800
Subject: [PATCH] Merge branch 'master-001'
---
smartor/src/main/java/com/smartor/domain/PatSatisfaction.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java b/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java
index 98149a4..cc29281 100644
--- a/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java
+++ b/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java
@@ -1,10 +1,13 @@
package com.smartor.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
* 鎮ｈ�呮弧鎰忓害瀵硅薄 pat_satisfaction
@@ -23,7 +26,6 @@
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
private Long id;
-
/**
* $column.columnComment
*/
@@ -140,6 +142,20 @@
private String delFlag;
/**
+ * 婊℃剰搴﹀畬鎴愭椂闂�-寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "婊℃剰搴﹀畬鎴愭椂闂�-寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 婊℃剰搴﹀畬鎴愭椂闂�-缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "婊℃剰搴﹀畬鎴愭椂闂�-缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
* pageNum
*/
@ApiModelProperty(value = "pageNum")
--
Gitblit v1.9.3