From 071152b1777b9b85daf01d49ffc06f3d14c49457 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期二, 06 五月 2025 21:28:27 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java b/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java index 2f908e6..9a3433a 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java @@ -52,7 +52,17 @@ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name="璧峰鏃ユ湡",dateFormat = "yyyy-MM-dd") - private Date startDate; + private Date startTime; + /** + * 缁撴潫鏃ユ湡 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name="缁撴潫鏃ユ湡",dateFormat = "yyyy-MM-dd") + private Date endTime; + /** + * 鍒嗕韩浜� + */ + private Integer shareId; } -- Gitblit v1.9.1