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

manailin

2021-06-30 cf2e6ce54f82c61606a01f816f7cac8b3a967809

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulOutOrLocalEnum.java

@@ -28,7 +28,7 @@
                return item.getCode();
            }
        }
        return 0;
        return -1;
    }

    public static String getCnDescByName(Integer code) {