v3.24.0【优化】SM4依赖优化；【优化】前端样式

!83 fix:修复代码生成功能中非空字段取值问题(取值取反了)
Merge pull request !83 from hchvhg/dev
2025-11-08 03:33:48 +08:00 · 2025-07-10 23:30:00 +08:00 · 2025-07-10 15:05:51 +00:00 · 2025-06-23 16:16:06 +08:00 · 2025-06-23 16:14:02 +08:00 · 2025-06-23 16:04:53 +08:00
7 changed files with 8 additions and 23 deletions
--- a/smart-admin-api-java17-springboot3/pom.xml
+++ b/smart-admin-api-java17-springboot3/pom.xml
@@ -241,6 +241,10 @@
                        <artifactId>logback-classic</artifactId>
                        <groupId>ch.qos.logback</groupId>
                    </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
                </exclusions>
            </dependency>

--- 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;
--- a/smart-admin-api-java17-springboot3/sa-base/pom.xml
+++ b/smart-admin-api-java17-springboot3/sa-base/pom.xml
@@ -210,12 +210,6 @@
        <dependency>
            <groupId>cn.idev.excel</groupId>
            <artifactId>fastexcel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>logback-classic</artifactId>
-                    <groupId>ch.qos.logback</groupId>
-                </exclusion>
-            </exclusions>
        </dependency>

        <dependency>
--- a/smart-admin-api-java8-springboot2/pom.xml
+++ b/smart-admin-api-java8-springboot2/pom.xml
@@ -267,6 +267,10 @@
                        <artifactId>logback-classic</artifactId>
                        <groupId>ch.qos.logback</groupId>
                    </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
                </exclusions>
            </dependency>

--- a/smart-admin-api-java8-springboot2/sa-base/pom.xml
+++ b/smart-admin-api-java8-springboot2/sa-base/pom.xml
@@ -231,12 +231,6 @@
        <dependency>
            <groupId>cn.idev.excel</groupId>
            <artifactId>fastexcel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>logback-classic</artifactId>
-                    <groupId>ch.qos.logback</groupId>
-                </exclusion>
-            </exclusions>
        </dependency>

        <dependency>
--- 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();
 </script>
-<style scoped lang="less">
-  .role-container {
-    height: 100%;
-  }
-</style>
--- 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();
 </script>
-<style scoped lang="less">
-  .role-container {
-    height: 100%;
-  }
-</style>
Author	SHA1	Message	Date
zhuoda	97df843072	v3.24.0【优化】SM4依赖优化；【优化】前端样式	2025-07-10 23:30:00 +08:00
1024创新实验室	12bd821770	!83 fix:修复代码生成功能中非空字段取值问题(取值取反了) Merge pull request !83 from hchvhg/dev	2025-07-10 15:05:51 +00:00
hchvhg	2b6ead23bd	fix:修复代码生成功能中非空字段取值问题(取值取反了)	2025-06-23 16:16:06 +08:00
hchvhg	b2aa70ce9e	暂时恢复代码	2025-06-23 16:14:02 +08:00
hchvhg	143a500c44	fix:修复代码生成功能非空字段取值问题(取值取反了)	2025-06-23 16:04:53 +08:00
hchvhg	8302ba4c2c	处理DictDataVO类报错问题	2025-06-23 15:42:48 +08:00