From 3966e2e88284c074b5316f6783c21ad11726f20e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Mar 2024 09:22:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=20?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/PayCommonProjectController.java     | 2 ++
 .../java/com/jero/project/entity/PayCommonProject.java     | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 9c0d6e68..7ca70ca7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -558,6 +558,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 			 payCommonProject.setEffectiveDate(tbMemberProjectSubitem.getEffectiveDate());
 			 payCommonProject.setInvalidationDate(tbMemberProjectSubitem.getInvalidationDate());
 			 payCommonProject.setEquityStatus(tbMemberProjectSubitem.getEquityStatus());
+			 payCommonProject.setRemarks(tbMemberProjectSubitem.getRemark());
+			 payCommonProject.setChargeNoticeId(tbMemberProjectSubitem.getChargeNoticeId());
 
 		 }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
index 8cd64cb1..54fb30cf 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
@@ -351,13 +351,6 @@ public class PayCommonProject implements Serializable {
     @ApiModelProperty(value = "收费标准")
     private BigDecimal chargeStandard;
 
-    /**
-     * 收费通知文件id
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "收费通知文件id")
-    private String chargeNoticeFileId;
-
     /**会员编号*/
     @TableField(exist = false)
     @ApiModelProperty(value = "会员编号")