From 08eefab8f0b04018dc62928ec2191bcae9d3e7d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 15 十月 2021 16:25:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
index 22cb7df..8a63880 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
@@ -7,6 +7,9 @@
import java.util.Date;
+/**
+ * @author zzj
+ */
@Data
@ApiModel
public class CommonPage {
@@ -24,10 +27,10 @@
private String phone;
@ApiModelProperty("地址参数")
private String address;
- @ApiModelProperty("开始时间")
+ @ApiModelProperty("创建开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date beginTime;
- @ApiModelProperty("结束时间")
+ @ApiModelProperty("创建结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
@ApiModelProperty("系统用户姓名")
@@ -36,4 +39,24 @@
private Long userId;
@ApiModelProperty("参数id")
private Long paramId;
+ @ApiModelProperty("类型")
+ private Integer type;
+ @ApiModelProperty("状态开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date statusBeginTime;
+ @ApiModelProperty("状态结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date statusEndTime;
+ @ApiModelProperty("编号")
+ private String serialNo;
+ @ApiModelProperty("小区id")
+ private Long areaId;
+ @ApiModelProperty("关键字")
+ private String keyword;
+ @ApiModelProperty("职务")
+ private String position;
+ @ApiModelProperty("参数id2")
+ private Integer paramId2;
+ @ApiModelProperty("社区id")
+ private Long communityId;
}
--
Gitblit v1.7.1