Merge remote-tracking branch 'origin/master'

huanghongfa

2022-02-22 206aa4bf5fd44e9b31d7284d6be8dc60b90a73ae

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

@@ -34,6 +34,7 @@
    @ApiModelProperty("题目id")
    private Long reserveSubId;
    @ApiModelProperty("填报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date time;
    @ApiModelProperty("用户昵称")
    private String nickName;