Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

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

@@ -34,7 +34,7 @@
        //构建单个用户数据
        List<Object> userData = new ArrayList<>();

        String noExport = "以上信息仅用于疫苗防控";
        String noExport = "以上信息仅用于";
        //遍历答案列表
        Long reserveRecordId = 0L;
        Long reserveSubId = 0L;