Merge branch 'Dev' into 'Test'

Dev

See merge request crowd-2019/crowd-test-service-backend!70

site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTaskVO.java

@@ -39,6 +39,7 @@ public class CrowdTaskVO implements Serializable {
     private Timestamp datetime;
     private int participantCount;
     private int acceptedCount;
+    private int joinCount;
     private int participantHasCommittedCount;
     private StatusVO statusVO;
     private FullStatusVO fullStatusVO;
@@ -69,6 +70,7 @@ public class CrowdTaskVO implements Serializable {
         datetime = task.getDeadTime();
         participantCount = task.getParticipantCount();
         acceptedCount = task.getAcceptedCount();
+        joinCount = task.getAcceptedCount();
         createTime = task.getCreateTime();
         participantHasCommittedCount = task.getParticipantHasCommittedCount();
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");