java/Robotaxi.git

			@@ -5,7 +5,9 @@
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.xiaopeng.api.vo.account.CouponVo;
			import com.xiaopeng.common.core.web.domain.BaseModel;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -49,7 +51,7 @@
			private BigDecimal limitation;

			@ApiModelProperty(value = "封面图片json")
			private JSONObject coverImage;
			private String coverImage;

			@ApiModelProperty(value = "开始时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@@ -97,9 +99,9 @@
			@ApiModelProperty("短信通知临近券生效前X分钟通知")
			private Integer smsActicityStartMinutes;
			@ApiModelProperty("短信通知屏蔽开始时间")
			private LocalDateTime smsStartBlockingTime;
			private String smsStartBlockingTime;
			@ApiModelProperty("短信通知屏蔽结束时间")
			private LocalDateTime smsEndBlockingTime;
			private String smsEndBlockingTime;
			@ApiModelProperty("小程序弹窗通知（0=否，1=是）")
			private Integer miniProgramNotification;
			@ApiModelProperty("小程序弹窗标题")
			@@ -107,9 +109,9 @@
			@ApiModelProperty("小程序弹窗按钮文案")
			private String miniProgramBtnText;
			@ApiModelProperty("小程序弹窗券到账提醒（0=否，1=是）")
			private String miniProgramReceivedReminder;
			private Integer miniProgramReceivedReminder;
			@ApiModelProperty("小程序弹窗即将过期提醒（0=否，1=是）")
			private String miniProgramAboutExpireReminder;
			private Integer miniProgramAboutExpireReminder;
			@ApiModelProperty("小程序弹窗临近券生效前X分钟")
			private Integer miniProgramAboutExpireMinutes;
			@ApiModelProperty("通知内容")
			@@ -131,5 +133,5 @@

			@ApiModelProperty(value = "优惠券")
			@TableField(exist = false)
			private List<XpActicityCoupon> coupons;
			private List<CouponVo> coupons;
			}