Merge branch 'release-hotfix-49479' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/service/impl/BoxModelServiceImpl.java

src/main/java/com/fdkankan/scene/service/impl/BoxModelServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -31,6 +32,7 @@ import com.fdkankan.web.response.ResultData;
 import com.google.common.collect.Lists;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Comparator;
@@ -93,7 +95,7 @@ public class BoxModelServiceImpl implements IBoxModelService {
             file.transferTo(new File(zipPath));
 
             //解压
-            ZipUtil.unzip(zipPath,srcPath);
+            ZipUtil.unzip(zipPath,srcPath, CharsetUtil.CHARSET_GBK);
 
             //校验是否包含目录，如果包含目录提示错误
             File srcFile = new File(srcPath);