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

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 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;