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-permission/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
index e42e7e9..22991ba 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
@@ -1,18 +1,18 @@
package com.vci.web.service.impl;
+import com.vci.constant.EnumIdConstant;
import com.vci.corba.omd.data.BusinessObject;
-import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.pagemodel.SmUserVO;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.KeyValue;
+import com.vci.pagemodel.SmUserVO;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.constant.EnumIdConstant;
-import com.vci.pagemodel.KeyValue;
import com.vci.web.properties.WebProperties;
-import com.vci.web.service.OsEnumServiceI;
+import com.vci.web.service.SmUserQueryServiceI;
import com.vci.web.service.WebBoServiceI;
+import com.vci.web.service.WebEnumServiceI;
import com.vci.web.service.WebSecretServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -43,7 +43,7 @@
*/
@Autowired(required = false)
@Lazy
- private OsEnumServiceI enumService;
+ private WebEnumServiceI enumService;
/**
* 鐢ㄦ埛鏌ヨ鏈嶅姟
--
Gitblit v1.9.3