Merge branch '计划任务' into dev

# Conflicts: # Hadoop/ZKLT.Hadoop.API/docker-build.bat
修改版本
1 changed files with 1 additions and 1 deletions
--- a/Hadoop/ZKLT.Hadoop.API/docker-build.bat
+++ b/Hadoop/ZKLT.Hadoop.API/docker-build.bat
@ -1 +1 @@
-docker build -f ./Dockerfile -t hadoop:1.0.6 ../../.
+docker build -f ./Dockerfile -t hadoop:1.0.7 ../../.
Author	SHA1	Message	Date
hhb	9d4f45bbe9	Merge branch '计划任务' into dev # Conflicts: # Hadoop/ZKLT.Hadoop.API/docker-build.bat	2 months ago
hhb	fbb3570fc2	修改版本	2 months ago
		`@ -1 +1 @@`
			`docker build -f ./Dockerfile -t hadoop:1.0.6 ../../.`				`docker build -f ./Dockerfile -t hadoop:1.0.7 ../../.`