Merge remote-tracking branch 'origin/master'

feige

2025-05-06 c24698dacd5d43d99bbae35b430a189675a6532b

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

@@ -103,5 +103,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date happenEndTime;


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