Merge branch 'dev-ltx' into dev/3.1_release_merge

# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java

src/main/java/com/ai/da/common/task/AccountTask.java

@@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @Component

src/main/java/com/ai/da/common/task/GenerateTask.java

@@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;

src/main/java/com/ai/da/common/task/MoveDataScheduler.java

@@ -17,8 +17,8 @@
 //import org.springframework.stereotype.Component;
 //import org.springframework.util.CollectionUtils;
 //
-//import javax.annotation.PostConstruct;
-//import javax.annotation.Resource;
+//import jakarta.annotation.PostConstruct;
+//import jakarta.annotation.Resource;
 //import java.io.FileOutputStream;
 //import java.io.IOException;
 //import java.nio.file.Files;

src/main/java/com/ai/da/common/task/PaymentTask.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDate;
 import java.util.List;