From 4e85cf00c3a77b7165f4d349da21e94b2b528909 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 四月 2025 10:05:41 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java index dc31ff8..39c3612 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java @@ -167,6 +167,24 @@ private String startTimeStr; @TableField(exist = false) private String endTimeStr; + @TableField(exist = false) + private Long current; + @TableField(exist = false) + private Long size; + /** + * 惠民卡状态:1未开始 2已开始 3已结束 + */ + @TableField(exist = false) + private Integer huiMinStatus; + + /** + * 1=平台,2=城市管理员,3=门店 + */ + @TableField(exist = false) + private Integer objectType; + + @TableField(exist = false) + private Integer objectId; @Override protected Serializable pkVal() { -- Gitblit v1.7.1