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

CeDo

2021-05-20 16239b07e3846b04fab68772a43a26fce6b2e0d8

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

@@ -58,7 +58,7 @@
    }

    public static String domicile(String cardId){
        return "四川省攀枝花市";
        return "-";
    }

    public static void main(String[] args) {