From 5f4018c7ab5a13c5f3ae5a0155a121e150f4ad74 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 14 七月 2022 14:15:33 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 8a63880..f6707b3 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
@@ -34,7 +34,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
@ApiModelProperty("系统用户姓名")
- private Date systemName;
+ private String systemName;
@ApiModelProperty("用户Id")
private Long userId;
@ApiModelProperty("参数id")
@@ -59,4 +59,14 @@
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;
}
--
Gitblit v1.7.1