Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-21 782f0259bc2c0362a1075ea401c815186321d8c6

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

@@ -18,4 +18,10 @@
    Integer vipTypeId;
    @ApiModelProperty(value = "单位id")
    Integer companyId;

    @ApiModelProperty(value = "到期天数1")
    Integer vipEndTime1;
    @ApiModelProperty(value = "到期天数2")
    Integer vipEndTime2;

}