Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-03 147a7ce2b1cc45cb58c69c82c3b0e0b2d3910b05

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java

@@ -61,4 +61,7 @@

    @ApiModelProperty("是否可重复提交（1.是 2.否）")
    private Integer isRepeat;

    @ApiModelProperty("图标类型")
    private Integer imgType;
}