Merge remote-tracking branch 'origin/test' into test

CeDo

2021-06-03 5d1e6dbb4a9abff2ef984058914b73e7f2ced736

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java

@@ -27,6 +27,9 @@
    @ApiModelProperty(value = "服务单号")
   private String orderSn;

   @ApiModelProperty(value = "事件类型")
    private String EventClazz;

    @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
   private Long eventCategory;

@@ -48,6 +51,9 @@
    @ApiModelProperty(value = "网格员名字")
   private String gridMemberName;

   @ApiModelProperty(value = "网格员头像")
   private String gridMemberImageUrl;

    @ApiModelProperty(value = "网格员联系方式")
   private String gridMemberTelephone;