From 67b7fca6f21c2088a1887ba2027360efdb089c1c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 16:08:12 +0800
Subject: [PATCH] 代码合并冲突解决
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java
index 762bc8c..3abe891 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java
@@ -8,12 +8,12 @@
*/
public class DictionItemConstants {
- private DictionItemConstants() {
- throw new IllegalStateException("Utility class");
- }
-
/**
* 文化层度字典编码
*/
public static final String LC_CULTURE_LEVEL = "1156457421221564414";
+
+ private DictionItemConstants() {
+ throw new IllegalStateException("Utility class");
+ }
}
--
Gitblit v1.7.1