From bf9dace0d838a0a7c1cbf066b81969f99907a7df Mon Sep 17 00:00:00 2001
From: "shunyi.kuang" <846002312@qq.com>
Date: Tue, 14 Apr 2026 11:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/UpdateLngPlanYearDemandHdrDto.java    | 110 +++++++++++-
 .../dto/UpdateLngPlanYearDemandHdrEcDto.java  | 106 ++++++++++++
 .../plan/vo/LngPlanYearDemandHdrEcVo.java     | 161 +++++++++++++++++-
 .../plan/vo/LngPlanYearDemandHdrVo.java       | 152 ++++++++++++++++-
 .../module/plan/vo/LngPlanYearDemandVo.java   |  12 +-
 .../PlanYearDemandHdrController.java          |   2 +-
 .../PlanYearDemandHdrEcController.java        |   2 +-
 .../module/plan/entity/LngPlanYearDemand.java |   7 +-
 .../plan/entity/LngPlanYearDemandEc.java      |   6 +-
 .../plan/entity/LngPlanYearDemandHdr.java     | 125 +++++++++++++-
 .../plan/entity/LngPlanYearDemandHdrEc.java   | 120 +++++++++++--
 11 files changed, 757 insertions(+), 46 deletions(-)

diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java
index ed38f3c..8a47bd9 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java
@@ -59,14 +59,14 @@ public class UpdateLngPlanYearDemandHdrDto implements Serializable {
     /**
     * 最新版(Y-是，N-否；每客户每年只有一个Y)
     */
-    @LogField(name="最新版(Y-是，N-否；每客户每年只有一个Y)",index=4)
+    @LogField(name="最新版",index=4)
     @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)")
     private String lastSign;
     
     /**
     * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)
     */
-    @LogField(name="审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)",index=5)
+    @LogField(name="审批状态",index=5)
     @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)")
     private String approCode;
     
@@ -91,6 +91,112 @@ public class UpdateLngPlanYearDemandHdrDto implements Serializable {
     @ApiModelProperty("租户id")
     private Long tenantId;
     
+    /**
+    * 1月备注
+    */
+    @ApiModelProperty("1月备注")
+	 @LogField(name="1月备注",index=9)
+    private String note01;
+    
+    /**
+    * 2月备注
+    */
+    @ApiModelProperty("2月备注")
+	 @LogField(name="2月备注",index=10)
+    private String note02;
+    
+    /**
+    * 3月备注
+    */
+    @ApiModelProperty("3月备注")
+	 @LogField(name="3月备注",index=11)
+    private String note03;
+    
+    /**
+    * 4月备注
+    */
+    @ApiModelProperty("4月备注")
+	 @LogField(name="4月备注",index=12)
+    private String note04;
+    
+    /**
+    * 5月备注
+    */
+    @ApiModelProperty("5月备注")
+	 @LogField(name="5月备注",index=13)
+    private String note05;
+    
+    /**
+    * 6月备注
+    */
+    @ApiModelProperty("6月备注")
+	 @LogField(name="6月备注",index=14)
+    private String note06;
+    
+    /**
+    * 7月备注
+    */
+    @ApiModelProperty("7月备注")
+	 @LogField(name="7月备注",index=15)
+    private String note07;
+    
+    /**
+    * 8月备注
+    */
+    @ApiModelProperty("8月备注")
+	 @LogField(name="8月备注",index=16)
+    private String note08;
+    
+    /**
+    * 9月备注
+    */
+    @ApiModelProperty("9月备注")
+	 @LogField(name="9月备注",index=17)
+    private String note09;
+    
+    /**
+    * 10月备注
+    */
+    @ApiModelProperty("10月备注")
+	 @LogField(name="10月备注",index=18)
+    private String note10;
+    
+    /**
+    * 11月备注
+    */
+    @ApiModelProperty("11月备注")
+	 @LogField(name="11月备注",index=19)
+    private String note11;
+    
+    /**
+    * 12月备注
+    */
+    @ApiModelProperty("12月备注")
+	 @LogField(name="12月备注",index=20)
+    private String note12;
+   
+   /**
+   * 次年1月备注
+   */
+   @ApiModelProperty("次年1月备注")
+	@LogField(name="次年1月备注",index=21)
+   private String noteN1;
+   
+   /**
+   * 次年2月备注
+   */
+   @ApiModelProperty("次年2月备注")
+	@LogField(name="次年2月备注",index=22)
+   private String noteN2;
+   
+   /**
+   * 次年3月备注
+   */
+   @ApiModelProperty("次年3月备注")
+	@LogField(name="次年3月备注",index=23)
+   private String noteN3;
+   
+    
     /**
      * lngPlanYearDemand
      */
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java
index cc3ce85..64c39c3 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java
@@ -96,6 +96,112 @@ public class UpdateLngPlanYearDemandHdrEcDto implements Serializable {
     @ApiModelProperty("租户id")
     private Long tenantId;
     
+    /**
+    * 1月备注
+    */
+    @ApiModelProperty("1月备注")
+	 @LogField(name="1月备注",index=9)
+    private String note01;
+    
+    /**
+    * 2月备注
+    */
+    @ApiModelProperty("2月备注")
+	 @LogField(name="2月备注",index=10)
+    private String note02;
+    
+    /**
+    * 3月备注
+    */
+    @ApiModelProperty("3月备注")
+	 @LogField(name="3月备注",index=11)
+    private String note03;
+    
+    /**
+    * 4月备注
+    */
+    @ApiModelProperty("4月备注")
+	 @LogField(name="4月备注",index=12)
+    private String note04;
+    
+    /**
+    * 5月备注
+    */
+    @ApiModelProperty("5月备注")
+	 @LogField(name="5月备注",index=13)
+    private String note05;
+    
+    /**
+    * 6月备注
+    */
+    @ApiModelProperty("6月备注")
+	 @LogField(name="6月备注",index=14)
+    private String note06;
+    
+    /**
+    * 7月备注
+    */
+    @ApiModelProperty("7月备注")
+	 @LogField(name="7月备注",index=15)
+    private String note07;
+    
+    /**
+    * 8月备注
+    */
+    @ApiModelProperty("8月备注")
+	 @LogField(name="8月备注",index=16)
+    private String note08;
+    
+    /**
+    * 9月备注
+    */
+    @ApiModelProperty("9月备注")
+	 @LogField(name="9月备注",index=17)
+    private String note09;
+    
+    /**
+    * 10月备注
+    */
+    @ApiModelProperty("10月备注")
+	 @LogField(name="10月备注",index=18)
+    private String note10;
+    
+    /**
+    * 11月备注
+    */
+    @ApiModelProperty("11月备注")
+	 @LogField(name="11月备注",index=19)
+    private String note11;
+    
+    /**
+    * 12月备注
+    */
+    @ApiModelProperty("12月备注")
+	 @LogField(name="12月备注",index=20)
+    private String note12;
+   
+   /**
+   * 次年1月备注
+   */
+   @ApiModelProperty("次年1月备注")
+	@LogField(name="次年1月备注",index=21)
+   private String noteN1;
+   
+   /**
+   * 次年2月备注
+   */
+   @ApiModelProperty("次年2月备注")
+	@LogField(name="次年2月备注",index=22)
+   private String noteN2;
+   
+   /**
+   * 次年3月备注
+   */
+   @ApiModelProperty("次年3月备注")
+	@LogField(name="次年3月备注",index=23)
+   private String noteN3;
+   
+    
     /**
      * lngPlanYearDemand
      */
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java
index 6328c19..c9a3bdc 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java
@@ -1,16 +1,10 @@
 package com.xjrsoft.module.plan.vo;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
 * @title: 表单出参
@@ -126,7 +120,156 @@ public class LngPlanYearDemandHdrEcVo extends com.xjrsoft.common.model.base.Base
     private Long ruleUserId;
     
     
+    /**
 
+    1月备注
+
+    */
+
+    @ApiModelProperty("1月备注")
+
+    private String note01;
+
+    /**
+
+    2月备注
+
+    */
+
+    @ApiModelProperty("2月备注")
+
+    private String note02;
+
+    /**
+
+    3月备注
+
+    */
+
+    @ApiModelProperty("3月备注")
+
+    private String note03;
+
+    /**
+
+    4月备注
+
+    */
+
+    @ApiModelProperty("4月备注")
+
+    private String note04;
+
+    /**
+
+    5月备注
+
+    */
+
+    @ApiModelProperty("5月备注")
+
+    private String note05;
+
+    /**
+
+    6月备注
+
+    */
+
+    @ApiModelProperty("6月备注")
+
+    private String note06;
+
+    /**
+
+    7月备注
+
+    */
+
+    @ApiModelProperty("7月备注")
+
+    private String note07;
+
+    /**
+
+    8月备注
+
+    */
+
+    @ApiModelProperty("8月备注")
+
+    private String note08;
+
+    /**
+
+    9月备注
+
+    */
+
+    @ApiModelProperty("9月备注")
+
+    private String note09;
+
+    /**
+
+    10月备注
+
+    */
+
+    @ApiModelProperty("10月备注")
+
+    private String note10;
+
+    /**
+
+    11月备注
+
+    */
+
+    @ApiModelProperty("11月备注")
+
+    private String note11;
+
+    /**
+
+    12月备注
+
+    */
+
+    @ApiModelProperty("12月备注")
+
+    private String note12;
+
+    /**
+
+    次年1月备注
+
+    */
+
+    @ApiModelProperty("次年1月备注")
+
+    private String noteN1;
+
+    /**
+
+    次年2月备注
+
+    */
+
+    @ApiModelProperty("次年2月备注")
+
+    private String noteN2;
+
+    /**
+
+    次年3月备注
+
+    */
+
+    @ApiModelProperty("次年3月备注")
+
+    private String noteN3;
+    
     private List<LngPlanYearDemandEcVo> lngPlanYearDemandList;
 
 }
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java
index 2a1114c..2330f91 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java
@@ -126,8 +126,158 @@ public class LngPlanYearDemandHdrVo extends com.xjrsoft.common.model.base.BaseMo
     @ApiModelProperty("数据权限id")
     private Long ruleUserId;
     
-    
+    /**
+
+    1月备注
+
+    */
+
+    @ApiModelProperty("1月备注")
+
+    private String note01;
+
+    /**
+
+    2月备注
+
+    */
+
+    @ApiModelProperty("2月备注")
+
+    private String note02;
+
+    /**
+
+    3月备注
+
+    */
+
+    @ApiModelProperty("3月备注")
+
+    private String note03;
+
+    /**
+
+    4月备注
+
+    */
+
+    @ApiModelProperty("4月备注")
+
+    private String note04;
+
+    /**
+
+    5月备注
+
+    */
+
+    @ApiModelProperty("5月备注")
+
+    private String note05;
+
+    /**
+
+    6月备注
+
+    */
+
+    @ApiModelProperty("6月备注")
+
+    private String note06;
+
+    /**
+
+    7月备注
+
+    */
+
+    @ApiModelProperty("7月备注")
+
+    private String note07;
+
+    /**
+
+    8月备注
+
+    */
+
+    @ApiModelProperty("8月备注")
+
+    private String note08;
+
+    /**
+
+    9月备注
+
+    */
+
+    @ApiModelProperty("9月备注")
+
+    private String note09;
+
+    /**
+
+    10月备注
+
+    */
+
+    @ApiModelProperty("10月备注")
+
+    private String note10;
+
+    /**
+
+    11月备注
+
+    */
+
+    @ApiModelProperty("11月备注")
+
+    private String note11;
+
+    /**
+
+    12月备注
+
+    */
+
+    @ApiModelProperty("12月备注")
+
+    private String note12;
+
+    /**
+
+    次年1月备注
+
+    */
+
+    @ApiModelProperty("次年1月备注")
+
+    private String noteN1;
+
+    /**
+
+    次年2月备注
+
+    */
+
+    @ApiModelProperty("次年2月备注")
+
+    private String noteN2;
+
+    /**
+
+    次年3月备注
+
+    */
+
+    @ApiModelProperty("次年3月备注")
+
+    private String noteN3;
 
     private List<LngPlanYearDemandVo> lngPlanYearDemandList;
+    
+    
 
 }
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java
index 0c30979..9c74d6f 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java
@@ -1,16 +1,10 @@
 package com.xjrsoft.module.plan.vo;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
 * @title: 表单出参
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java
index 4ea8ba9..f3b5380 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java
@@ -64,7 +64,7 @@ public class PlanYearDemandHdrController {
                 //.like(StrUtil.isNotBlank(dto.getPlanYear()),LngPlanYearDemandHdr::getPlanYear,dto.getPlanYear())
                 //.like(StrUtil.isNotBlank(dto.getDemandVerNo()),LngPlanYearDemandHdr::getDemandVerNo,dto.getDemandVerNo())
                 .like(StrUtil.isNotBlank(dto.getCuCode()),LngPlanYearDemandHdr::getCuCode,dto.getCuCode())
-                .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdr::getNote,dto.getNote())
+               // .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdr::getNote,dto.getNote())
                 .like(StrUtil.isNotBlank(dto.getReply()),LngPlanYearDemandHdr::getReply,dto.getReply())
                 .like(StrUtil.isNotBlank(dto.getApproCode()),LngPlanYearDemandHdr::getApproCode,dto.getApproCode())
                     .orderByDesc(LngPlanYearDemandHdr::getId)
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java
index ba26b69..998740b 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java
@@ -71,7 +71,7 @@ public class PlanYearDemandHdrEcController {
                 .eq(ObjectUtil.isNotNull(dto.getId()),LngPlanYearDemandHdrEc::getId,dto.getId())
                 //.like(StrUtil.isNotBlank(dto.getPlanYear()),LngPlanYearDemandHdrEc::getPlanYear,dto.getPlanYear())
                 //.like(StrUtil.isNotBlank(dto.getDemandVerNo()),LngPlanYearDemandHdrEc::getDemandVerNo,dto.getDemandVerNo())
-                .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdrEc::getNote,dto.getNote())
+               // .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdrEc::getNote,dto.getNote())
                 .like(StrUtil.isNotBlank(dto.getReply()),LngPlanYearDemandHdrEc::getReply,dto.getReply())
                 .like(StrUtil.isNotBlank(dto.getApproCode()),LngPlanYearDemandHdrEc::getApproCode,dto.getApproCode())
                     .orderByDesc(LngPlanYearDemandHdrEc::getId)
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java
index 09e574f..6398795 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java
@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.pictc.annotations.datalog.LogTable;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -161,11 +160,7 @@ public class LngPlanYearDemand implements Serializable {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal qtyN3;
     
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String note;
+  
     
     /**
     * 创建人id
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java
index 2499da8..faf4690 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java
@@ -160,11 +160,7 @@ public class LngPlanYearDemandEc implements Serializable {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal qtyN3;
     
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String note;
+ 
     
     /**
     * 创建人id
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java
index 9595fe9..ba7e6e1 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java
@@ -58,7 +58,7 @@ public class LngPlanYearDemandHdr implements Serializable {
     * 版本(自动生成，每客户每年从1开始)
     */
     @ApiModelProperty("版本(自动生成，每客户每年从1开始)")
-    @LogField(name="版本(自动生成，每客户每年从1开始)",index=3)
+    @LogField(name="版本",index=3)
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Byte demandVerNo;
     
@@ -66,7 +66,7 @@ public class LngPlanYearDemandHdr implements Serializable {
     * 最新版(Y-是，N-否；每客户每年只有一个Y)
     */
     @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)")
-    @LogField(name="最新版(Y-是，N-否；每客户每年只有一个Y)",index=4)
+    @LogField(name="最新版",index=4)
     private String lastSign;
     
     /**
@@ -126,6 +126,127 @@ public class LngPlanYearDemandHdr implements Serializable {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long tenantId;
     
+    /**
+    * 1月备注
+    */
+    @ApiModelProperty("1月备注")
+	 @LogField(name="1月备注",index=9)
+	 @TableField(value="note_01")
+    private String note01;
+    
+    /**
+    * 2月备注
+    */
+    @ApiModelProperty("2月备注")
+	 @LogField(name="2月备注",index=10)
+	 @TableField(value="note_02")
+    private String note02;
+    
+    /**
+    * 3月备注
+    */
+    @ApiModelProperty("3月备注")
+	 @LogField(name="3月备注",index=11)
+	 @TableField(value="note_03")
+    private String note03;
+    
+    /**
+    * 4月备注
+    */
+    @ApiModelProperty("4月备注")
+	 @LogField(name="4月备注",index=12)
+    @TableField(value="note_04")
+    private String note04;
+    
+    /**
+    * 5月备注
+    */
+    @ApiModelProperty("5月备注")
+	 @LogField(name="5月备注",index=13)
+	 @TableField(value="note_05")
+    private String note05;
+    
+    /**
+    * 6月备注
+    */
+    @ApiModelProperty("6月备注")
+	 @LogField(name="6月备注",index=14)
+    @TableField(value="note_06")
+    private String note06;
+    
+    /**
+    * 7月备注
+    */
+    @ApiModelProperty("7月备注")
+	 @LogField(name="7月备注",index=15)
+	 @TableField(value="note_07")
+    private String note07;
+    
+    /**
+    * 8月备注
+    */
+    @ApiModelProperty("8月备注")
+	 @LogField(name="8月备注",index=16)
+	 @TableField(value="note_08")
+    private String note08;
+    
+    /**
+    * 9月备注
+    */
+    @ApiModelProperty("9月备注")
+	 @LogField(name="9月备注",index=17)
+	 @TableField(value="note_09")
+    private String note09;
+    
+    /**
+    * 10月备注
+    */
+    @ApiModelProperty("10月备注")
+	 @LogField(name="10月备注",index=18)
+	 @TableField(value="note_10")
+    private String note10;
+    
+    /**
+    * 11月备注
+    */
+    @ApiModelProperty("11月备注")
+	 @LogField(name="11月备注",index=19)
+	 @TableField(value="note_11")
+    private String note11;
+    
+    /**
+    * 12月备注
+    */
+    @ApiModelProperty("12月备注")
+	 @LogField(name="12月备注",index=20)
+	 @TableField(value="note_12")
+    private String note12;
+   
+   /**
+   * 次年1月备注
+   */
+   @ApiModelProperty("次年1月备注")
+	@LogField(name="次年1月备注",index=21)
+	@TableField(value="note_n1")
+   private String noteN1;
+   
+   /**
+   * 次年2月备注
+   */
+   @ApiModelProperty("次年2月备注")
+	@LogField(name="次年2月备注",index=22)
+	@TableField(value="note_n2")
+   private String noteN2;
+   
+   /**
+   * 次年3月备注
+   */
+   @ApiModelProperty("次年3月备注")
+   @LogField(name="次年3月备注",index=23)
+   @TableField(value="note_n3")
+   private String noteN3;
+   
+    
     /**
     * 部门id
     */
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java
index 2595449..f9dccd1 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java
@@ -1,21 +1,17 @@
 package com.xjrsoft.module.plan.entity;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.github.yulichang.annotation.EntityMapping;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 
 /**
@@ -132,6 +128,110 @@ public class LngPlanYearDemandHdrEc implements Serializable {
     @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
     private Long ruleUserId;
     
-
+    /**
+    * 1月备注
+    */
+    @ApiModelProperty("1月备注")
+	 @TableField(value="note_01")
+    private String note01;
+    
+    /**
+    * 2月备注
+    */
+    @ApiModelProperty("2月备注")
+	 @TableField(value="note_02")
+    private String note02;
+    
+    /**
+    * 3月备注
+    */
+    @ApiModelProperty("3月备注")
+	 @TableField(value="note_03")
+    private String note03;
+    
+    /**
+    * 4月备注
+    */
+    @ApiModelProperty("4月备注")
+    @TableField(value="note_04")
+    private String note04;
+    
+    /**
+    * 5月备注
+    */
+    @ApiModelProperty("5月备注")
+	 @TableField(value="note_05")
+    private String note05;
+    
+    /**
+    * 6月备注
+    */
+    @ApiModelProperty("6月备注")
+    @TableField(value="note_06")
+    private String note06;
+    
+    /**
+    * 7月备注
+    */
+    @ApiModelProperty("7月备注")
+	 @TableField(value="note_07")
+    private String note07;
+    
+    /**
+    * 8月备注
+    */
+    @ApiModelProperty("8月备注")
+	 @TableField(value="note_08")
+    private String note08;
+    
+    /**
+    * 9月备注
+    */
+    @ApiModelProperty("9月备注")
+	 @TableField(value="note_09")
+    private String note09;
+    
+    /**
+    * 10月备注
+    */
+    @ApiModelProperty("10月备注")
+	 @TableField(value="note_10")
+    private String note10;
+    
+    /**
+    * 11月备注
+    */
+    @ApiModelProperty("11月备注")
+	 @TableField(value="note_11")
+    private String note11;
+    
+    /**
+    * 12月备注
+    */
+    @ApiModelProperty("12月备注")
+	 @TableField(value="note_12")
+    private String note12;
+   
+   /**
+   * 次年1月备注
+   */
+   @ApiModelProperty("次年1月备注")
+	@TableField(value="note_n1")
+   private String noteN1;
+   
+   /**
+   * 次年2月备注
+   */
+   @ApiModelProperty("次年2月备注")
+	@TableField(value="note_n2")
+   private String noteN2;
+   
+   /**
+   * 次年3月备注
+   */
+   @ApiModelProperty("次年3月备注")
+	@TableField(value="note_n3")
+   private String noteN3;
+   
 
 }
\ No newline at end of file