1. 中铝e办组织机构人员同步联调接口

2. 设置默认文件预览水印为人员加日期

(cherry picked from commit 07c9ead358)

yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java

@@ -12,6 +12,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.cloud.openfeign.FeignClientFactory;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.jdbc.Sql;
@@ -31,6 +32,9 @@ public class BaseDbUnitTest {
     @MockBean
     private SequenceCommonApi sequenceCommonApi;
 
+    @MockBean
+    private FeignClientFactory feignClientFactory;
+
     @Import({
             // DB 配置类
             YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类

yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java

@@ -8,6 +8,7 @@ import org.redisson.spring.starter.RedissonAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.cloud.openfeign.FeignClientFactory;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 
@@ -25,6 +26,9 @@ public class BaseRedisUnitTest {
     @MockBean
     private SequenceCommonApi sequenceCommonApi;
 
+    @MockBean
+    private FeignClientFactory feignClientFactory;
+
     @Import({
             // Redis 配置类
             RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer