From 12fd820acec998c56b928907b92beca32e6ae90b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 09:29:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/common/constant/FtpConstant.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/common/constant/FtpConstant.java b/src/main/java/org/springblade/common/constant/FtpConstant.java
index 91447df..4cce995 100644
--- a/src/main/java/org/springblade/common/constant/FtpConstant.java
+++ b/src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -18,12 +18,12 @@
 	/**
 	 * ftp服务器IP地址
 	 */
-//	String ftpHost_dev = "192.168.0.105";
+	String ftpHost_dev = "192.168.0.105";
 
 	/**
 	 * ftp服务器IP地址
 	 */
-	String ftpHost_dev = "172.19.1.30";
+	//String ftpHost_dev = "172.19.1.30";
 
 	/**
 	 * ftp服务器端口
@@ -44,12 +44,12 @@
 	/**
 	 * ftp服务器路径
 	 */
-	String ftpPath = "yly/anbao/";
-//	String ftpPath = "anbao/";
+	//String ftpPath = "yly/anbao/";
+	String ftpPath = "anbao/";
 
 	/**
 	 * 本地路径
 	 */
-	String localPath = "/home/zhongsong/anbao/";
-//	String localPath = "D:\\anbao\\";
+	//String localPath = "/home/zhongsong/anbao/";
+	String localPath = "D:\\anbao\\";
 }

--
Gitblit v1.9.3