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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java

@@ -68,7 +68,7 @@ public class TEmployeeProjectController {
 	 **/
 	@Operation(summary = "根据人员档案id获取项目list,projectStatus：1或不传，则查全部；0，查在项。", description = "根据人员档案id获取项目list")
 	@GetMapping("/getListByEmpId" )
-	public R<List<TEmployeeProject>> getListByEmpId(@RequestParam String empId, Integer projectStatus) {
+	public R<List<TEmployeeProject>> getListByEmpId(@RequestParam String empId, @RequestParam(required = false) Integer projectStatus) {
 		if (projectStatus == null) {
 			projectStatus = CommonConstants.ONE_INT;
 		}