Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

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

@@ -98,4 +98,6 @@
    @TableField(exist = false)
    private Date happenEndTime;

    private Integer shareId;

}