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

huanghongfa

2021-06-29 bfae897ebaea752b489ee92777043b9f83cfe736

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