From d48849cfcc2e45340921edab4685a8f260793b50 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 11 四月 2026 10:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见
---
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index 3385739..82a657c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
private Long salesLedgerProductId;
- @ApiModelProperty(value = "鐘舵��")
+ @ApiModelProperty(value = "鐘舵�� 寰呭鏍� 瀹℃牳涓� 锛屽鏍告嫆缁� 瀹℃牳閫氳繃 宸插彂璐�")
@Excel(name = "鐘舵��")
private String status;
--
Gitblit v1.9.3