From cd0aa1777cc69ce9c6edee94a4d46784543e5ad8 Mon Sep 17 00:00:00 2001
From: zhangjun <zhangjun@DESKTOP-BF9USEF>
Date: Fri, 30 Nov 2018 16:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AD=97=E8=8A=82=E7=9A=84=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml     |  2 ++
 WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index ad7d9523d..0b4775fbb 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -1496,6 +1496,7 @@
 			    <attribute name="EBANK_STATUS" label="回盘状态" type="STRING" length="32"/>
 			    <attribute name="FUND_FEETYPE" label="抵扣资金项" type="STRING" length="100"/>
 			    <attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
+			    <attribute name="DEDUCTION_ID" label="保证金抵扣编号" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1562,6 +1563,7 @@
 				<attribute name="EBANK_STATUS" label="回盘状态" type="STRING" length="32"/>
 				<attribute name="FUND_FEETYPE" label="抵扣资金项" type="STRING" length="100"/>
 				<attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
+				<attribute name="DEDUCTION_ID" label="保证金抵扣编号" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 29de7f127..917fa990a 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -943,9 +943,9 @@
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
 				<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
-				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
+				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
 				<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
-				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
+				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
 				
 				<attribute name="DEALER_LEGAL_NAME" label="经销商法定名称" type="STRING" length="32"/>
 				<attribute name="DEALER_PHONE" label="公司联系电话" type="STRING" length="32"/>
@@ -1130,9 +1130,9 @@
 				<attribute name="SUBMIT_TYPE" label="提交状态" type="STRING" length="32"/>
 				<attribute name="APPLY_NUMBER" label="申请编号唯一" type="STRING" length="32"/>
 				<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
-				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
+				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
 				<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
-				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
+				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
 				<attribute name="district" label="地区" type="STRING" length="64"/>
 				<attribute name="provinceInfo" label="省份" type="STRING" length="64"/>
         		<attribute name="open_bank" label="开户银行" type="STRING" length="100"/>   
@@ -1242,9 +1242,9 @@
 				<attribute name="DISTRIBUTOR_FORM_ID" label="经销商正式表id" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_CHANGE_ID" label="经销商变更表id" type="STRING" length="32"/>
 				<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
-				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
+				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
 				<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
-				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
+				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
 	 			
 	 			<attribute name="DEALER_LEGAL_NAME" label="经销商法定名称" type="STRING" length="32"/>
 				<attribute name="DEALER_PHONE" label="公司联系电话" type="STRING" length="32"/>
@@ -1437,9 +1437,9 @@
 				<attribute name="DISTRIBUTOR_FORM_ID" label="经销商正式表id" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_CHANGE_ID" label="经销商变更表的id" type="STRING" length="32"/>
 				<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
-				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
+				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
 				<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
-				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
+				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1541,9 +1541,9 @@
 				<attribute name="DISTRIBUTOR_FORM_ID" label="经销商正式表id" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_CHANGE_ID" label="经销商变更表的id" type="STRING" length="32"/>
 				<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
-				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
+				<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
 				<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
-				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
+				<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
 			</attributes>
 			<manager>
 				<managerProperties>