Merge branch 'master' of http://121.5.58.50:3000/finikes/ocv1-server

src/main/java/com/finikes/oc/vote/service/VoteServiceImpl.java

@@ -282,7 +282,7 @@ public class VoteServiceImpl implements VoteService {
             }
 
             Choice choice = new Choice();
-            choice.setAssigneeId(passport.getId());
+            choice.setPassportId(passport.getId());
             choice.setOptionId(dto.getOptionId());
             choice.setProxy(false);
             choice.setChooseTime(now);
@@ -345,7 +345,7 @@ public class VoteServiceImpl implements VoteService {
             }
 
             Choice choice = new Choice();
-            choice.setAssigneeId(dto.getPrincipalId());
+            choice.setPassportId(dto.getPrincipalId());
             choice.setOptionId(dto.getOptionId());
             choice.setAssigneeId(passport.getId());
             choice.setProxy(true);

src/main/resources/mapper/ChoiceMapper.xml

@@ -26,7 +26,7 @@
         t_choice choice,
         t_house_relation relation
         WHERE vote_option.vote_id = #{voteId}
-        AND choice.assignee_id = relation.passportId
+        AND choice.passport_id = relation.passportId
         AND certificateNo = #{certificateNo}
         AND state = 1
     </select>