Merge remote-tracking branch 'origin/master'

feige

2024-10-18 98cd4713254614381ede8fa42d0820a3ffc1d53e

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