From c3ef548aa36678645b3860c0cf9a0283a97efb92 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 14 九月 2024 15:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java
index 8592795..ac53bae 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java
@@ -38,7 +38,7 @@
     public Long proId;
 
     @TableField(exist = false)
-    public String proName;
+    public String name;
 
     /**
     * 鐢熶骇鏁伴噺

--
Gitblit v1.8.0