Merge remote-tracking branch 'origin/master'

feige

2024-06-10 2f432628a460a73f830c278a7d69e8328767a7b6

 zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java

@@ -49,6 +49,9 @@
    @Excel(name = "宠物品种")
    private String type;

    @Excel(name = "宠物类型")
    private String animal;

    /**
     * 宠物名称
     */