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/ComActQuestnaireSubSelectionVO.java

@@ -11,8 +11,8 @@
    private Long id;
    @ApiModelProperty("问题题目ID")
    private Long queSubId;
    @ApiModelProperty("选项排序")
    private int optin;
    @ApiModelProperty("选项名")
    private String optionName;
    @ApiModelProperty("选项内容")
    private String content;