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

无关风月

2 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 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;