Merge branch 'test' into 'master'

罗元桥

2021-07-15 d2baab8c43dca88365dac6e98a95ceee644001e2

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

@@ -75,7 +75,7 @@
            if(idCardProto!=null && idCardProto.contains("x")){
                idCardProto = idCardProto.replaceAll("x", "X");
            }
            String idCardEncrypted = e.getIdCard();
            String idCardEncrypted = idCardProto;
            try {
                idCardEncrypted = AESUtil.encrypt128(idCardEncrypted, aesKey);
            } catch (Exception exp) {