From 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 15 八月 2024 20:13:38 +0800
Subject: [PATCH] 测试git提交冲突问题
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
index 8fab024..e44f76c 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
@@ -10,5 +10,5 @@
@AllArgsConstructor
@Builder
public class QueryVo extends QueryConditionVo {
- public String name;
+ public String userName;
}
\ No newline at end of file
--
Gitblit v1.8.0