diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index 83ce2051c..86e3bf924 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -29,8 +29,11 @@
 	if("ReadOnly".equals(rightType)){
 	dwTemp.ReadOnly = "1";//只读模式
 	}
-	String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT where acc_number='755915678910202'");
-	String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT where acc_number='755915678910202'");
+	String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT limit 0,1");
+	String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT limit 0,1");
+	
+	 String acc = Sqlca.getString("select acc_number from DISTRIBUTOR_ACCOUNT where distributor_id="+"'"+DistributorNo+"'"+" limit 0,1");
+	String acco = Sqlca.getString("select account from DISTRIBUTOR_ACCOUNT where distributor_id="+"'"+DistributorNo+"'"+" limit 0,1"); 
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
 	dwTemp.getDataObject().setVisible("CAUTION_MONEY", true);
 	String sButtons[][] = {
@@ -42,6 +45,8 @@
 	window.onload=function(){
 		setItemValue(0,0,"LOCAL_ACCOUNT",'<%=acc_number%>');
 		setItemValue(0,0,"LOCAL_BANK",'<%=acc_bank%>');
+		setItemValue(0,0,"ACCOUNT_INFO",'<%=acc%>');
+		setItemValue(0,0,"ACCOUNT",'<%=acco%>');
 	}
 
 
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
index ab9becbc1..44b56d756 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
@@ -50,7 +50,7 @@
 		//{temp,"","Button","详情","查看/修改详情","view()","","","","btn_icon_detail"},
 		{temp,"","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""},
 	  	//{"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
-		{temp,"All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		{temp,"All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 		};
 
 	} 
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index aaf5d2a06..22fbbc9e1 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -3998,6 +3998,32 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="LB_DISCOUNT" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑" type="STRING" length="64"/>
+				<attribute name="CONTRACT_NO" label="鍚堝悓缂栧彿" type="STRING" length="64"/>
+				<attribute name="CAR_BRAND" label="鍝佺墝" type="STRING" length="64"/>
+				<attribute name="FRAME_NUMBER" label="杞︽灦鍙�" type="STRING" length="64"/>
+				<attribute name="DISCOUNT_MONEY" label="璐存伅閲戦" type="STRING" length="64"/>
+				<attribute name="FIELD1" label="FIELD1" type="STRING" length="64"/>
+				<attribute name="FIELD2" label="FIELD2" type="STRING" length="64"/>
+				<attribute name="FIELD3" label="FIELD3" type="STRING" length="64"/>
+				<attribute name="FIELD4" label="FIELD4" type="STRING" length="64"/>
+				<attribute name="FIELD5" label="FIELD5" type="STRING" length="64"/>
+				<attribute name="INPUTUSERID" label="INPUTUSERID" type="STRING" length="64"/>
+				<attribute name="INPUTORGID" label="INPUTORGID" type="STRING" length="64"/>
+				<attribute name="INPUTTIME" label="绯荤粺瀵煎叆鏃ユ湡" type="STRING" length="64"/>
+				<attribute name="UPDATEUSERID" label="UPDATEUSERID" type="STRING" length="64"/>
+				<attribute name="UPDATEORGID" label="UPDATEORGID" type="STRING" length="64"/>
+				<attribute name="UPDATETIME" label="UPDATETIME" type="STRING" length="64"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_discount" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 	<package name="jbo.com.tenwa.lease.carbrand" >
 	<class name="LB_CLAIMS_BOOK_DETAIL" label="绱㈣禂鐢宠涔﹁鎯呰〃" keyAttributes="ID">
diff --git a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
index 18b682708..b598d93ca 100644
--- a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
+++ b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
@@ -27,7 +27,6 @@ public class WordToPDFUtil {
 			 logger.info("============转换pdf开始============");
 	         try{
 	        	 String path = QuartzPropertiesUtil.get("libreOffice_path");
-//				 String cmd = "/opt/libreoffice5.4/program/soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
 	        	 String cmd = path+"\\soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath;
 	        	 logger.info("python:"+cmd);
 				 process = Runtime.getRuntime().exec(cmd);