Merge branch 'test_bak' into 'master'

罗元桥

2021-09-27 d7a8baeff8b0e68c54a959e5f46f639c54aad1d1

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