Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-11-17 a7e51f7d5d77a0019723c5dcf1a65599a4bf2b7b

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

@@ -40,4 +40,6 @@
   private List<ComEventRequestImageVO> images;
   @ApiModelProperty("处理人")
   private String solver;


}