Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

10 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 cloud-server-course/src/main/java/com/dsh/course/model/CoursePackageInfo.java

@@ -45,4 +45,8 @@
    private StudentVo student;
    @ApiModelProperty("1常规 2假期 3体验")
    private Integer type;
    @ApiModelProperty("假期有效期")
    private String time;

    private Integer isVip;
}