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

huanghongfa

2021-08-04 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052

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

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

    public static String getCnDescByName(Integer code) {