Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into zx_online_update_1218

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -237,6 +237,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         result.setTeacherId(group.getTeacherId());
         result.setCoursePrice(group.getCoursePrice());
         result.setCourseNum(group.getCourseNum());
+        result.setCompleteCourseNum(group.getCompleteCourseNum());
         result.setCourseIntroduce(group.getCourseIntroduce());
         result.setSalesStartDate(group.getSalesStartDate());
         result.setSalesEndDate(group.getSalesEndDate());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseGroupVo.java

@@ -63,6 +63,9 @@ public class CourseGroupVo implements Serializable {
     @ApiModelProperty(value = "课程数")
     private Integer courseNum;
 
+    @ApiModelProperty(value = "已上完课的课程数")
+    private Integer completeCourseNum;
+
     @ApiModelProperty(value = "课程介绍")
     private String courseIntroduce;