Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

zqy

2024-11-09 f0792fca6d0874de97411af39c4d58d0c120412f

 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);
    }