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-platform/src/main/java/com/dy/pmsPlatform/proItems/QueryVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/QueryVo.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/QueryVo.java
index 68b6bb9..d7eb1e8 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/QueryVo.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/QueryVo.java
@@ -11,5 +11,5 @@
@Builder
public class QueryVo extends QueryConditionVo {
public String item;
- public String proName;
+ public Long proId;
}
--
Gitblit v1.8.0