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

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

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

@@ -9,9 +9,21 @@
 */
@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;
    private String label;

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

    @ApiModelProperty(value = "选项key")
    private String key;
}