Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-11-23 0590944f5d4a4f93af2a4c9241f0e154a9f41c08

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

@@ -4996,6 +4996,7 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());
        populationDO.setDeath(vo.getDeath().toString());

        String cardNoAES = populationDO.getCardNo();
        try {