Merge remote-tracking branch 'origin/V1' into V1

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonInfoController.java

@@ -798,7 +798,7 @@ public class PersonInfoController {
             //todo 返回导入失败报表下载链接
             msgResult.setResult(true);
             msgResult.setData(downloadUrl);
-
+            msgResult.setResult(true);
             //将exal输出到哪个文件夹中
 //            ByteArrayOutputStream out = new ByteArrayOutputStream();
 //            workbook.write(out);