Merge remote-tracking branch 'origin/master'

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyController.java

@@ -957,7 +957,7 @@ public class InsurancePolicyController {
                 HSSFCell cellContent4 = rowContent.createCell(3);
                 if(insurancePolicy.getNumber() != null) cellContent4.setCellValue(insurancePolicy.getNumber());
                 HSSFCell cellContent5 = rowContent.createCell(4);
-                if(insurancePolicy.getStartTime() != null && insurancePolicy.getEndTime() != null) cellContent5.setCellValue(sdf.format(insurancePolicy.getStartTime()) + " - " + sdf.format(insurancePolicy.getEndTime()));
+                if(insurancePolicy.getStartTime() != null && insurancePolicy.getEndTime() != null) cellContent5.setCellValue(sdf.format(insurancePolicy.getStartTime()) + "至" + sdf.format(insurancePolicy.getEndTime()));
                 HSSFCell cellContent6 = rowContent.createCell(5);
                 if(insurancePolicy.getCreateTime() != null) cellContent6.setCellValue(sdfEx.format(insurancePolicy.getCreateTime()));
                 HSSFCell cellContent7 = rowContent.createCell(6);
@@ -975,7 +975,7 @@ public class InsurancePolicyController {
             byte[] buffer = output.toByteArray();
             ByteArrayInputStream input = new ByteArrayInputStream(buffer);
 
-            String downloadUrl = OSSUtil.upload(ossConfig,"import","InsurancePolicy.xls",input);
+            String downloadUrl = OSSUtil.upload(ossConfig,"import","我的保单.xls",input);
 
             //todo 返回导入失败报表下载链接