处理一些合并冲突

backend-java/src/main/java/com/nanri/aiimage/AiImageApplication.java

@@ -4,11 +4,17 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.time.ZoneId;
+import java.util.TimeZone;
+
 @SpringBootApplication
 @EnableScheduling
 public class AiImageApplication {
 
+    private static final ZoneId BUSINESS_ZONE = ZoneId.of("Asia/Shanghai");
+
     public static void main(String[] args) {
+        TimeZone.setDefault(TimeZone.getTimeZone(BUSINESS_ZONE));
         SpringApplication.run(AiImageApplication.class, args);
     }
 }