代码合并

huanghongfa

2021-06-21 a429d8ffa31825c7cca7e005bc9ce8f85c15f1f6

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

@@ -18,14 +18,14 @@
    @ApiModelProperty("本月新增")
    private Long currentNum;

    @ApiModelProperty("已处理随手拍")
    private List<EastPhotoTypeVO> deal;
    @ApiModelProperty("已处理")
    private List<PieElementVO> deal;

    @ApiModelProperty("已公示随手拍")
    private List<EastPhotoTypeVO> pub;
    @ApiModelProperty("已公示")
    private List<PieElementVO> pub;

    @ApiModelProperty("已审核随手拍")
    private List<EastPhotoTypeVO> approved;
    @ApiModelProperty("已驳回")
    private List<PieElementVO> approved;

    @ApiModelProperty("未处理")
    private Long noneDeal;
@@ -34,8 +34,10 @@
    private Integer pubPoint;

    @ApiModelProperty("平均耗时")
    private Integer dealTime;
    private String dealTime;

    @ApiModelProperty("线形图统计时间段")
    private String listTimes;

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