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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

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

@@ -45,7 +45,7 @@
    private String payUser;
    private String phone;
    // 学员id
    private Integer studentId;
    private String studentId;
    private String payStudent;
    private Integer payType;