Parcourir la source

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

刘俊驰 il y a 1 jour
Parent
commit
5a740a81a6

+ 0 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/CourseRepliedController.java

@@ -51,7 +51,6 @@ public class CourseRepliedController extends BaseController {
     @PostMapping(value = "/myReplied")
     public HttpResponseResult<PageInfo<MyRepliedVo>> myReplied(@RequestBody MyCourseSearch search) {
         search.setTeacherId(sysUserService.getUserId());
-        search.setCourseType(null);
         IPage<MyRepliedVo> pages = repliedService.myReplied(PageUtil.getPage(search), search);
         return succeed(PageUtil.pageInfo(pages));
     }

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MyCourseSearch.java

@@ -48,7 +48,7 @@ public class MyCourseSearch extends QueryInfo {
     private String endDate;
 
     @ApiModelProperty(value = "课程类型")
-    private String courseType = "PRACTICE";
+    private String courseType;
 
     @ApiModelProperty(value = "考勤状态 , false:未考勤 true:已考勤")
     private Boolean attendanceStatus;