SHA1
--- a/code/jyyy/nckd-jimin-jyyy-fi/bin/main/nckd/jimin/jyyy/fi/common/CommonHelperUtils.class
+++ b/code/jyyy/nckd-jimin-jyyy-fi/bin/main/nckd/jimin/jyyy/fi/common/CommonHelperUtils.class
--- a/code/jyyy/nckd-jimin-jyyy-fi/bin/main/nckd/jimin/jyyy/fi/webapi/AttachmentFileUtil.class
+++ b/code/jyyy/nckd-jimin-jyyy-fi/bin/main/nckd/jimin/jyyy/fi/webapi/AttachmentFileUtil.class
--- a/code/jyyy/nckd-jimin-jyyy-fi/bin/main/nckd/jimin/jyyy/fi/webapi/TransDetailApiPlugin.class
+++ b/code/jyyy/nckd-jimin-jyyy-fi/bin/main/nckd/jimin/jyyy/fi/webapi/TransDetailApiPlugin.class
--- a/code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/AttachmentFileUtil.java
+++ b/code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/AttachmentFileUtil.java
@@ -16,6 +16,11 @@ import nckd.jimin.jyyy.fi.common.CommonHelperUtils;
 
				 import org.apache.commons.net.ftp.FTP;
			
 
				 import org.apache.commons.net.ftp.FTPClient;
			
 
				 import org.apache.commons.net.ftp.FTPReply;
			
 
				+<<<<<<< HEAD
			
 
				+import nckd.jimin.jyyy.bd.common.CommonHelperUtils;
			
 
				+
			
 
				+=======
			
 
				+>>>>>>> dcaa1e1363c6ea3a50ec93ae9197973378c6e556
			
 
				 import java.io.*;
			
 
				 import java.net.HttpURLConnection;
			
 
				 import java.net.URL;
Autor	SHA1 Správa	Dátum
wangjun	b6c392859f Merge branch 'master' of http://111.75.220.136:10030/turborao/jyyy	22 hodín pred
wangjun	a9df635731 修改引用	22 hodín pred