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/PageTestObjectDto.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
index 684cf46..f5ad6fc 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
@@ -19,7 +19,4 @@
@ApiModelProperty(value = "鏇存柊浜�")
private String updateUserName;
-
- @ApiModelProperty(value = "闆朵欢鍙�")
- private String partNo;
}
--
Gitblit v1.9.3