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

huanghongfa

2021-06-17 98e440f566479fe07b0a6d0028e3df21843c86ee

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

@@ -19,13 +19,13 @@
    private Long currentNum;

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

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

    @ApiModelProperty("已驳回")
    private List<EastPhotoTypeVO> approved;
    private List<PieElementVO> approved;

    @ApiModelProperty("未处理")
    private Long noneDeal;