代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 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");
    }
}