Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-16 066d1a38611c9a986db71daabbdce70366b1e6c8

Merge remote-tracking branch 'origin/master'

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

@@ -211,7 +211,11 @@
                                try {
                                    ComActQuestnaireAnswerContentVO firstvo = answers.get(keySet.toArray()[0]).get(0);
                                    if (firstvo != null) {
                                        dateStr =  firstvo.getCreateAt().toString();
                                        Date time = firstvo.getCreateAt();
                                        if(time!=null) {
                                            String sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(time);
                                            dateStr = sd;
                                        }
                                    }
                                }catch (Exception e){
                                    dateStr = "";