Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

101captain

2021-08-31 f44305b8af1fa7f5a8211d5c10f061b6f8963031

Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java

@@ -513,12 +513,13 @@
                            if(!reserveRecordId.equals(userAnswers.getReserveRecordId())){
                                datalist.add(userData);
                                userData = new ArrayList<>();
                                reserveRecordId = userAnswers.getReserveRecordId();
                                userData.add(userAnswers.getNickName());
                                userData.add(DateUtils.format(userAnswers.getTime(),DateUtils.ymdhms_format));
                                reserveRecordId = userAnswers.getReserveRecordId();
                            }
                            userData.add(userAnswers.getAnswerContent());
                        }
                        datalist.add(userData);
                    }

                    WriteCellStyle headWriteCellStyle = new WriteCellStyle();