From 84b51d9bfddcc8da58823fde1b322a8168db5cff Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 27 五月 2022 09:35:23 +0800
Subject: [PATCH] bug修改

---
 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