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

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java

@@ -68,6 +68,7 @@ public class IcEpidemicPreventionController{
     @PostMapping("user-list")
     public Result<PageData<EpidemicPreventionResultDTO>> userList(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         PageData<EpidemicPreventionResultDTO> result = icResiUserService.userList(formDTO);
         return new Result<PageData<EpidemicPreventionResultDTO>>().ok(result);
     }