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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrder.java

@@ -115,6 +115,11 @@
     */
    @TableField("salesName")
    private String salesName;
    /**
     * 订单类型（1=购买订单，2=积分商品兑换订单）
     */
    @TableField("orderType")
    private Integer orderType;

    @TableField(exist = false)
    private Integer type;