Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-22 1bc9bbff762653151ca80957c3f31ab54a5a42ca

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java

@@ -7,6 +7,7 @@

@Data
public class PointsQueryDto extends BasePage {
    @ApiModelProperty("用户id")
   private   Long userId;
    @ApiModelProperty("1收入0支出")
    private    Integer type;