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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

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

@@ -46,7 +46,10 @@
   /**当前机构下处理人ID*/
   @ApiModelProperty(name = "currentProcessUserId", value = "当前机构下处理人ID")
   private Long currentProcessUserId;

   private Long createBy;
   private Long pageNo;
   private Long pageSize;
   private String keyword;
   @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件")
   private Integer userType;
}