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

puzhibing

2024-03-15 889749753021d76463d85450bd95e6615886956e

 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;