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

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

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

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

@@ -796,6 +796,7 @@ public class PersonInfoController {
             String downloadUrl = OSSUtil.upload(ossConfig,"import","error.xls",input);
 
             //todo 返回导入失败报表下载链接
+
             msgResult.setData(downloadUrl);
             msgResult.setResult(true);
             //将exal输出到哪个文件夹中