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

lidongdong

2022-10-10 95668edbe2d05516c7b91ebb7bba02f715328b78

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java

@@ -132,4 +132,7 @@
   private String categoryName;
   @ApiModelProperty("当前调解部门")
   private String currentOrgName;
   @ApiModelProperty("用户取消时间")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date revokeDate;
}