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

tangxiaobao

2021-09-04 52e0ad7f25ca50e375bce10e47c9e30f3d39bdb2

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

@@ -14,6 +14,9 @@
    @ApiModelProperty("题目内容")
    private String content;

    @ApiModelProperty("类型 0 单选  1 多选 2 输入框  3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框")
    private Integer type;

    public ComActReserveSubListVO() {
    }