From b7f529dc88d23d8045aa799856db5ddbb4677208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 1 Sep 2021 15:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/project/entity/PayWorkingGroupSubItem.java  | 4 ++++
 .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
index 551871a1..8792cbf5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
@@ -13,6 +13,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Size;
+
 /**
  * @Description: pay_working_group_subitem
  * @Author: jeecg-boot
@@ -34,10 +36,12 @@ public class PayWorkingGroupSubItem implements Serializable {
 	/**来款项目*/
 	@Excel(name = "来款项目", width = 15)
     @ApiModelProperty(value = "来款项目")
+    @Size(max = 100,message = "来款项目长度应小于100个字符")
     private java.lang.String chargeProject;
 	/**工作组id*/
 	@Excel(name = "工作组id", width = 15)
     @ApiModelProperty(value = "工作组id")
+    @Size(max = 32,message = "工作组id长度应小于32个字符")
     private java.lang.String workingGroupId;
     /**成员单位id*/
     @Excel(name = "成员单位id", width = 15)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 8e22e1ac..92479696 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -15,7 +15,7 @@
             year_charge_a AS yearChargeA,
             charge_notice_no_a AS chargeNoticeNoA,
             charge_notice_a_id AS chargeNoticeAId,
-            year_charge_b AS yeaChargeB,
+            year_charge_b AS yearChargeB,
             charge_notice_no_b AS chargeNoticeNoB,
             charge_notice_b_id AS chargeNoticeBId,
             mission_and_objectives AS missionAndObjectives,