Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-20 34181dcf0e38d744b8af1917bb5b8b0180b9eae1

 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;
}