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

luoyuanqiao

2022-03-01 d76c9f4e730422cbe43496adfc57a6e3d36577ab

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java

@@ -44,7 +44,7 @@
            for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
                a++;
                if(answerContentVOList.size()==26&&a==9){
                   userData.add("");
                   userData.add(" ");
                }
                //判断是文字描述直接跳过
                if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)