Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

CeDo

2021-06-03 1fbdd1f48a5ec551a4c044d4babd95633e36d62e

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

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "id")
   private Long id;

   @ApiModelProperty(value = "事件处理状态")
   private Integer eventDealStatus;

    @ApiModelProperty(value = "服务单号")
   private String orderSn;

@@ -36,6 +39,9 @@
    @ApiModelProperty(value = "网格ID")
   private Long gridId;

   @ApiModelProperty(value = "网格名称")
   private String gridName;

    @ApiModelProperty(value = "网格员")
   private Long gridMemberId;