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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

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

@@ -47,4 +47,6 @@
    private Integer type;
    @ApiModelProperty("假期有效期")
    private String time;

    private Integer isVip;
}