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

lidongdong

2022-10-09 02b087d8d55a7931d87c6e39423d9362463d67c9

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

@@ -130,4 +130,6 @@

   @ApiModelProperty("时间类型名称")
   private String categoryName;
   @ApiModelProperty("当前调解部门")
   private String currentOrgName;
}