From c5aac1b321d3840a56ccc41108d42b389d68681e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 16 五月 2026 11:03:37 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_山西_晋和园_pro

---
 src/main/java/com/ruoyi/purchase/dto/SimpleReturnOrderGroupDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/dto/SimpleReturnOrderGroupDto.java b/src/main/java/com/ruoyi/purchase/dto/SimpleReturnOrderGroupDto.java
index dc9220a..e66382e 100644
--- a/src/main/java/com/ruoyi/purchase/dto/SimpleReturnOrderGroupDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/SimpleReturnOrderGroupDto.java
@@ -16,6 +16,6 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class SimpleReturnOrderGroupDto implements Serializable {
-    private Long salesLedgerProductId;
+    private Long productModelId;
     private BigDecimal sumReturnQuantity;
 }

--
Gitblit v1.9.3