Merge branch '计划任务' into dev

# Conflicts: # Hadoop/ZKLT.Hadoop.API/docker-build.bat
2 months ago · 9d4f45bbe9
parent ef5dd2b7f3 fbb3570fc2
commit 9d4f45bbe9
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 ../../.
		`@ -1 +1 @@`
			`docker build -f ./Dockerfile -t hadoop:1.0.6 ../../.`				`docker build -f ./Dockerfile -t hadoop:1.0.7 ../../.`