feat: 修复代码冲突

hjl

2024-06-06 c62e9f81b2072473b084abb30f7c005ed341a336

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java

@@ -11,6 +11,8 @@
    private String subject;
    @ApiModelProperty("可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;


}