From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
new file mode 100644
index 0000000..efd5d2e
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
@@ -0,0 +1,11 @@
+package com.ruoyi.basic.dto;
+
+import lombok.Data;
+
+@Data
+public class ProductDto {
+
+ private Integer id;
+
+ private String name;
+}
--
Gitblit v1.9.3