Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-28 b2a64967d13f68175cd0c47f1a5b6169c42ed8a9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java

@@ -159,4 +159,11 @@
   @TableField(exist = false)
   @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
   private List<ComEventRequestImageVO> images;
   @TableField(exist = false)
   private String icon;
   /**调解事件类型*/
   @TableField(exist = false)
   private String eventCategoryName;
   @TableField(exist = false)
   private String keyword;
}