Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/domain/MeetingExpertJudge.java

@@ -30,6 +30,8 @@ public class MeetingExpertJudge implements Serializable {
     @ApiModelProperty("会议ID")
     private Long meetingId;
 
+    private Long expertId;
+
     @ApiModelProperty("会议专家ID")
     private Long meetingExpertId;
 

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingExpertJudgeManage.java

@@ -63,6 +63,7 @@ public class MeetingExpertJudgeManage {
                 throw BizException.wrap("履职评价已提交");
             }
             MeetingExpertJudge entity = BeanUtil.copyProperties(req, MeetingExpertJudge.class);
+            entity.setExpertId(expert.getExpertId());
             expertJudgeService.save(entity);
         } finally {
             distributedLock.releaseLock(key);