Merge branch 'test_screen' into 'master'

罗元桥

2021-06-17 a7b550f95172e29d71aa38dca45cacf7f31949b8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java

@@ -71,6 +71,10 @@
        List<ComEldersAuthElderlyDO> listNewDO = new ArrayList<>();
        List<ComEldersAuthElderlyDO> listUpdateDO = new ArrayList<>();
        list.forEach(e->{
            String idCardProto = e.getIdCard();
            if(idCardProto!=null && idCardProto.contains("x")){
                idCardProto = idCardProto.replaceAll("x", "X");
            }
            String idCardEncrypted = e.getIdCard();
            try {
                idCardEncrypted = AESUtil.encrypt128(idCardEncrypted, aesKey);