From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleControlAreaEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java
similarity index 88%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleControlAreaEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java
index f09fc71..a38e7da 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleControlAreaEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java
@@ -1,7 +1,7 @@
-package com.vci.frameworkcore.enumpck;
+package com.vci.enumpck.UI;
 
-//import com.vci.frameworkcore.constant.FrameWorkEnumConstant;
-
+import com.vci.constant.FrameWorkEnumConstant;
+import com.vci.starter.web.annotation.VciEnum;
 import com.vci.starter.web.enumpck.BaseEnum;
 
 /**
@@ -9,7 +9,7 @@
  * @author weidy
  * @date 2019/9/25
  */
-//@VciEnum(name = FrameWorkEnumConstant.ROLE_CONTROL_AREA,text = "瑙掕壊鎺у埗鍖哄煙",description = "鐢佃剳绔疊S,CS,绉诲姩绔�,闆嗘垚,寰湇鍔�")
+@VciEnum(name = FrameWorkEnumConstant.ROLE_CONTROL_AREA,text = "瑙掕壊鎺у埗鍖哄煙",description = "鐢佃剳绔疊S,CS,绉诲姩绔�,闆嗘垚,寰湇鍔�")
 public enum RoleControlAreaEnum implements BaseEnum {
     /**
      * 鐢佃剳绔疊/S

--
Gitblit v1.9.3