Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterMan...

lxw

2022-10-31 171aad80fc3fc9a244b9ebc62192f45f8b5ae1ef

 src/main/java/com/whyc/controller/FileParamController.java

@@ -28,7 +28,7 @@
    @GetMapping("getDataByCondition")
    public Response getDataByCondition(@RequestParam(required = false ,defaultValue = "1982-01-01 00:00:00") String startTime
                                       , @RequestParam(required = false,defaultValue = "2222-01-01 00:00:00") String endTime
                                       , @RequestParam(required = false) int battVol
                                       , @RequestParam(required = false) String battVol
                                       ,@RequestParam(required = false ,defaultValue = "1") int pageCurr
                                        ,@RequestParam(required = false ,defaultValue = "10") int pageSize)  {
        Date testTime1= null;