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/CoursePackagePayDTO.java

@@ -9,7 +9,7 @@
 */
@Data
public class CoursePackagePayDTO {
    private List<String> ids;
    private String ids;
    private String payUserName;
    // 操作人id
    private Integer userId;