Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

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

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

    public static String getCnDescByName(Integer code) {