From ad2201f809f45cbbe2e63a829e4c93a9c7b7f67c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 11 十一月 2022 10:00:19 +0800
Subject: [PATCH] #feat 修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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..261664f 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,40 @@
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;
+ @ApiModelProperty("商家id")
+ private Long merchantId;
+ @ApiModelProperty("街道id")
+ private Long streetId;
+ @ApiModelProperty("分类2")
+ private Integer type2;
+ @ApiModelProperty("一级分类")
+ private Integer columnId;
+ @ApiModelProperty("二级分类")
+ private Integer secondColumnId;
+ @ApiModelProperty(value = "是否公示（1.是 2.否）")
+ private Integer isPublicity;
+ @ApiModelProperty(value = "账号类型 1街道 2社区 3社会组织", hidden = true)
+ private Integer userType;
+ @ApiModelProperty(value = "社会组织id", hidden = true)
+ private Long orgId;
}
--
Gitblit v1.7.1