From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/CombinationEnum.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/CombinationEnum.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/CombinationEnum.java
similarity index 93%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/CombinationEnum.java
rename to Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/CombinationEnum.java
index 1d5793b..e5d3114 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/CombinationEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/CombinationEnum.java
@@ -1,11 +1,8 @@
-package com.vci.frameworkcore.enumpck;
-
-//import com.vci.frameworkcore.constant.FrameWorkEnumConstant;
-//import com.vci.starter.web.annotation.VciEnum;
+package com.vci.web.enumpck;
 
 import com.vci.starter.web.annotation.VciEnum;
 import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
 
 import java.util.List;
 import java.util.Objects;

--
Gitblit v1.9.3