【合并冲突】

5 years ago · c0f5709bb2
parent aef8841223
commit c0f5709bb2
1 changed files with 1 additions and 1 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -33,7 +33,7 @@ public class MesEnumUtil {
            this.description = description;
        }

-        public int getValue() {
+        public String getValue() {
            return value;
        }