From 983aac6c4deba5751dd546a263700fb1b0911ed9 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Thu, 10 Jul 2025 23:32:55 +0800 Subject: [PATCH] =?UTF-8?q?v3.24.0=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91SM4?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BC=98=E5=8C=96=EF=BC=9B=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- smart-admin-api-java17-springboot3/pom.xml | 4 ++++ .../module/system/role/service/RoleEmployeeService.java | 1 - smart-admin-api-java17-springboot3/sa-base/pom.xml | 6 ------ smart-admin-api-java8-springboot2/pom.xml | 4 ++++ smart-admin-api-java8-springboot2/sa-base/pom.xml | 6 ------ .../src/views/system/role/components/role-setting/index.vue | 5 ----- .../src/views/system/role/components/role-setting/index.vue | 5 ----- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/smart-admin-api-java17-springboot3/pom.xml b/smart-admin-api-java17-springboot3/pom.xml index 086d0ee..1e2b044 100644 --- a/smart-admin-api-java17-springboot3/pom.xml +++ b/smart-admin-api-java17-springboot3/pom.xml @@ -241,6 +241,10 @@ logback-classic ch.qos.logback + + org.bouncycastle + bcprov-jdk15on + diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java index 05481c0..88e22dc 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java @@ -22,7 +22,6 @@ import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; diff --git a/smart-admin-api-java17-springboot3/sa-base/pom.xml b/smart-admin-api-java17-springboot3/sa-base/pom.xml index a72aca4..bd5b22d 100644 --- a/smart-admin-api-java17-springboot3/sa-base/pom.xml +++ b/smart-admin-api-java17-springboot3/sa-base/pom.xml @@ -210,12 +210,6 @@ cn.idev.excel fastexcel - - - logback-classic - ch.qos.logback - - diff --git a/smart-admin-api-java8-springboot2/pom.xml b/smart-admin-api-java8-springboot2/pom.xml index d50cdb7..28671c0 100644 --- a/smart-admin-api-java8-springboot2/pom.xml +++ b/smart-admin-api-java8-springboot2/pom.xml @@ -267,6 +267,10 @@ logback-classic ch.qos.logback + + org.bouncycastle + bcprov-jdk15on + diff --git a/smart-admin-api-java8-springboot2/sa-base/pom.xml b/smart-admin-api-java8-springboot2/sa-base/pom.xml index fa760e1..788b77a 100644 --- a/smart-admin-api-java8-springboot2/sa-base/pom.xml +++ b/smart-admin-api-java8-springboot2/sa-base/pom.xml @@ -231,12 +231,6 @@ cn.idev.excel fastexcel - - - logback-classic - ch.qos.logback - - diff --git a/smart-admin-web-javascript/src/views/system/role/components/role-setting/index.vue b/smart-admin-web-javascript/src/views/system/role/components/role-setting/index.vue index 31c16db..292fe2d 100644 --- a/smart-admin-web-javascript/src/views/system/role/components/role-setting/index.vue +++ b/smart-admin-web-javascript/src/views/system/role/components/role-setting/index.vue @@ -37,8 +37,3 @@ let activeKey = ref(); - diff --git a/smart-admin-web-typescript/src/views/system/role/components/role-setting/index.vue b/smart-admin-web-typescript/src/views/system/role/components/role-setting/index.vue index 5a8247b..7ff80bc 100644 --- a/smart-admin-web-typescript/src/views/system/role/components/role-setting/index.vue +++ b/smart-admin-web-typescript/src/views/system/role/components/role-setting/index.vue @@ -37,8 +37,3 @@ let activeKey = ref(); -