Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfMasterController.java

@@ -50,7 +50,7 @@
     * 根据宠物id获取相关主人信息
     */
    @GetMapping()
    public AjaxResult getByPetId(@PathParam("pid")Long pid){
    public AjaxResult getByPetId(@PathParam("pid")String pid){
        return zfMasterService.getMasterInfoByPetId(pid);
    }