Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 91a2f11b8b74aa170abc32d2b5d9603b279c094d

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

@@ -9,8 +9,14 @@
 */
@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;