Merge branch 'test' into 'master'

罗元桥

2021-05-20 5d55062d003a17e197523f37d68d0e88ba727219

 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) {