Merge branch 'test' into 'master'

罗元桥

2021-08-01 051a7ddfc147d61285544e3f2d9eae057f2c774b

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