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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCoursePackagePayment.java

@@ -174,4 +174,6 @@
    private Integer hasHours;
    private BigDecimal laveCashPayment;
    private BigDecimal cashPayment1;
    // 所选课时规格id
    private Integer coursePackageConfigId;
}