From 103726c48a510af9fcdd8d7e88d8c5fd5fef0cc9 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 02 三月 2026 19:09:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/config/MyLocaleResolver.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/config/MyLocaleResolver.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/config/MyLocaleResolver.java
index 0ee8058..da6c85b 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/config/MyLocaleResolver.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/config/MyLocaleResolver.java
@@ -23,8 +23,6 @@
         Locale locale = null;
         if (StringUtils.isEmpty(language)) {
             locale = Locale.getDefault();
-        }
-        if (!StringUtils.hasLength(language)){
             language = "1";
         }
         //如果请求不为空 

--
Gitblit v1.7.1