代码合并

huanghongfa

2021-06-21 a429d8ffa31825c7cca7e005bc9ce8f85c15f1f6

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

@@ -34,7 +34,7 @@
    private Integer pubPoint;

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

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