Merge remote-tracking branch 'origin/master'

feige

2025-05-06 e6294707131b0c4dd7304713d8f59f91658394dd

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

@@ -115,5 +115,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;

    /**
     * 分享人id
     */
    private Integer shareId;

}