Merge branch 'test_screen' into 'master'

罗元桥

2021-06-21 3f78e5a92b54cfa64425e73611ae0ac7ba81bc52

 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;