Merge remote-tracking branch 'remotes/origin/test_excel610' into test

manailin

2021-06-21 26e9429512245f4b441b55c3ce59c21a5ebb570f

 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;
}