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

2 years ago · ddcb05d4be
1 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java
@ -102,7 +102,7 @@ public class DataSyncRecordMaritalController {
    @PostMapping("export")
    public void export(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordMaritalPageFormDTO formDTO, HttpServletResponse response) throws IOException {
        formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setUserId(tokenDto.getUserId());
        formDTO.setIsPage(false);
        ExcelWriter excelWriter = null;
        formDTO.setPageSize(NumConstant.TEN_THOUSAND);