Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2023-11-13 ab80b6c939db1c2f5ce142d27dcc310d41c37931

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

 crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java

@@ -22,4 +22,5 @@
    String startTime;
    /**浏览记录结束时间*/
    String endTime;
    String remarks;
}

 crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java

@@ -21,4 +21,7 @@

    @PostMapping(value = "/user/getUserOpRecord")
    Result getUserOpRecord( @RequestBody(required = false) UserDto userDto);

    @PostMapping(value = "/user/unbindingPhis")
    Result unbindingPhis( @RequestBody(required = false) UserDto userDto);
}