Merge branch 'test_bak' into 'master'

罗元桥

2021-09-22 ad0ba7a4cd8d9dc0358bcfa447efa6f27938295e

Merge branch 'test_bak' into 'master'

lyq-屏蔽预约登记导出图片选项

See merge request root/zhihuishequ!185

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

@@ -494,7 +494,7 @@
                    head1.add("登记时间");
                    headList.add(head1);
                    subVOList.forEach(sub -> {
                        if (sub.getType() != 5) {
                        if (sub.getType() != 5 && sub.getType() != 11) {
                            List<String> headn = new ArrayList<>();
                            headn.add(firstRowContent);
                            if(sub.getType() == 11){
@@ -584,7 +584,7 @@
        if (answerContentVOList != null && answerContentVOList.size() > 0) {
            for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
                //判断是文字描述直接跳过
                if (userAnswers.getOptionType().equals(5)) {
                if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)) {
                    continue;
                }
                //判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是