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

CeDo

2021-05-20 5ade6f6e4532b65b96d80eabe5d92302f6f817f4

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

@@ -14,7 +14,7 @@
@ApiModel("用户问卷回答信息")
public class UsersAnswerVO {
    @ApiModelProperty(value = "问卷信息")
    private ComActQuestnaireVO questnaireVO;
    private ComActQuestnaireVO questnaire;
    @ApiModelProperty(value = "用户调查问卷题目信息")
    private List<UsersSubAnswerVO> usersSubAnswerVOS;
    private List<UsersSubAnswerVO> usersSubAnswer;
}