Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java

@@ -112,22 +112,27 @@ public class FileUtil extends TimerTask {
 		switch (type) {
 			case "photo_1":
 				//上门
-				imgPath += "/door";
+//				imgPath += "/door";
+				imgPath += "/上门";
 				break;
 			case "photo_2":
-				imgPath += "/stacking";
+//				imgPath += "/stacking";
+				imgPath += "/堆码";
 				//堆码
 				break;
 			case "photo_3":
-				imgPath += "/friability";
+//				imgPath += "/friability";
+				imgPath += "/易碎";
 				//易碎
 				break;
 			case "photo_4":
-				imgPath += "/home-delivery";
+//				imgPath += "/home-delivery";
+				imgPath += "/家配";
 				//家配
 				break;
 			case "photo_5":
-				imgPath += "/signing";
+//				imgPath += "/signing";
+				imgPath += "/签收";
 				//签收
 				break;
 		}