From 7a2e1fd9e34ab58caf9fa8565e94dd9fcd174a1a Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 12 六月 2021 17:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_excel610' into test_excel610
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java
index 6161613..118ee3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java
@@ -35,7 +35,7 @@
return item.getCode();
}
}
- return -1;
+ return QT.getCode();
}
public static String getCnDescByName(Integer code) {
--
Gitblit v1.7.1