Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfMasterServiceImpl.java

@@ -27,7 +27,7 @@
public class ZfMasterServiceImpl extends ServiceImpl<ZfMasterMapper, ZfMaster> implements ZfMasterService {

    @Override
    public AjaxResult getMasterInfoByPetId(Long pid) {
    public AjaxResult getMasterInfoByPetId(String pid) {
        LambdaQueryWrapper<ZfMaster> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZfMaster::getPetId,pid);
        ZfMaster master = getOne(lqw);