Merge branch 'test' into 'test_wangge_two'

罗元桥

2021-06-23 72f11c9e9edec3d2534112badf7a0ca48fa9da5a

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