From d94776ba25ffcd19cdd7970048ed88d9212bd394 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 10:10:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
index 4f08eee..ffdb0e4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
@@ -58,10 +58,10 @@
 	@Excel(name = "省")
 	private String deliverProvince;
 	// 市
-	@Excel(name = "市")
+	@Excel(name = "省区划代码")
 	private String deliverProvinceCode;
 	// 省区划代码
-	@Excel(name = "省区划代码")
+	@Excel(name = "市")
 	private String deliverCity;
 	// 市区划代码
 	@Excel(name = "市区划代码")

--
Gitblit v1.7.1