Merge branch 'v5' of http://git.ycjcjy.com/welcome/service-welcome3 into v5

src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java

@@ -310,8 +310,8 @@ public class TaMainUsherRecordController extends BaseController {
      */
     @RequestMapping(value="/excel/usherListExcel",method= RequestMethod.GET)
     public void exportCustomerExcel(@RequestParam(value = "personName" ,required = false)String personName,
-                                    @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date startTime,
-                                    @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date endTime,
+                                    @RequestParam(value = "startTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+                                    @RequestParam(value = "endTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
                                     @RequestParam(value = "customerType" ,required = false)String customerType,
                                     @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
                                     @RequestParam(value = "receiver" ,required = false)String receiver,