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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java

@@ -9,9 +9,18 @@
 */
@Data
public class QuestnaiteSubSelectionVO {
    @ApiModelProperty(value = "问卷题目选项Id")
    private Long queSubSelectionId;

    @ApiModelProperty(value = "选项排序")
    private int sort;
    private Integer sort;

    @ApiModelProperty(value = "选项名")
    private String optionName;

    @ApiModelProperty(value = "选项内容")
    private String content;

    @ApiModelProperty(value = "选项类型 0 固定选项 1 自定义选项")
    private Integer type;
}