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

huanghongfa

2021-08-31 49de13627ada2e6c7864691bf4d9a75f7d3a67f3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java

@@ -1,11 +1,11 @@
package com.panzhihua.common.model.vos.screen;

import java.io.Serializable;
import java.util.List;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @author xyh
@@ -36,9 +36,7 @@
    @ApiModelProperty("平均耗时")
    private Integer dealTime;


    @ApiModelProperty("随手拍线形列表")
    private List<EastPhotoVO> list;


}