Merge remote-tracking branch 'origin/master'

feige

2025-05-06 e6294707131b0c4dd7304713d8f59f91658394dd

 zhang-content/src/main/java/com/ruoyi/service/ZfMasterService.java

@@ -17,7 +17,7 @@
 */
public interface ZfMasterService extends IService<ZfMaster> {

    AjaxResult getMasterInfoByPetId(Long pid);
    AjaxResult getMasterInfoByPetId(String pid);

    List<ZfMaster> selectByCondition(ZfMaster zfMaster);