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

project-order/src/main/java/com/dituhui/pea/order/controller/EngineerTimelineController.java

@@ -17,7 +17,7 @@ public class EngineerTimelineController {
 	private EngineerTimelineService engineerTimelineService;
 	private EngineerTimelineService engineerTimelineService;
 
 
 	@GetMapping("/engineer/work/dynamics")
 	@GetMapping("/engineer/work/dynamics")
-	public Result<?> GetEngineerTimeline(@RequestParam String engineerCode, String date) {
+	public Result<?> GetEngineerTimeline(@RequestParam String engineerCode, @RequestParam String date) {
 		return engineerTimelineService.getEngineerTimelines(engineerCode, date);
 		return engineerTimelineService.getEngineerTimelines(engineerCode, date);
 	}
 	}
 }
 }