Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

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

@@ -32,10 +32,12 @@
   /**当前调解处理结果*/
   @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
   private String currentEventProcessResult;
   /**调解是否成果1未成果2已成果*/
   /**调解是否成果1未成功2已成功*/
   @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
   private Integer eventSucceed;
   /**调解上传图片地址列表，逗号进行分割*/
   @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
   private List<ComEventRequestImageVO> images;
   @ApiModelProperty("处理人")
   private String solver;
}