Merge branch 'test' into 'master'

罗元桥

2021-06-24 ea9120887a18d0c121705ff312321097e3e8abcc

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

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

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

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