Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 94ae02e6f73b7011f0fcf6acff8636341d35351d

 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/UserCollectVO.java

@@ -11,6 +11,9 @@
@Data
public class UserCollectVO {

    @ApiModelProperty("服务id")
    private Integer serveId;

    @ApiModelProperty("服务名称")
    private String serveName;