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/PbWorkVO.java

@@ -22,9 +22,4 @@

    @ApiModelProperty("党员活动")
    private Long activity;

    @ApiModelProperty(hidden = true)
    private String start;
    @ApiModelProperty(hidden = true)
    private String end;
}