Merge remote-tracking branch 'origin/expert_invite' into dev

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/AvoidInfoVO.java

@@ -18,6 +18,9 @@ import java.util.List;
 @ApiModel("回避信息")
 public class AvoidInfoVO {
 
+    @ApiModelProperty("回避类型：1 回避同单位、2 回避同条线、3 不回避")
+    private Integer avoidType;
+
     @ApiModelProperty("回避单位")
     private List<String> avoidUnitIds;