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

huliguo

9 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopTaskRecordPageVo.java

@@ -1,6 +1,7 @@
package com.ruoyi.shop.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.shop.domain.dto.FileDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -25,6 +26,9 @@

    @ApiModelProperty(value = "用户头像")
    private String userPicture;

    @ApiModelProperty(value = "用户岗位")
    private String userPosition;

    @ApiModelProperty(value = "跟进id")
    private Long followId;
@@ -53,11 +57,11 @@
    private String callPhone;

    @ApiModelProperty(value="跟进图片地址")
    private List<String> picture;
    private List<FileDto> picture;

    @ApiModelProperty(value="跟进视频地址")
    private List<String> video;
    private List<FileDto> video;

    @ApiModelProperty(value="跟进音频地址")
    private List<String> audio;
    private List<FileDto> audio;
}