From 6593a67fdfb688c70365b419c0e9658c690524b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 09:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/model/QueryMySiteVo.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/QueryMySiteVo.java b/cloud-server-other/src/main/java/com/dsh/other/model/QueryMySiteVo.java
index ef7ea19..1d46c7a 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/model/QueryMySiteVo.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/QueryMySiteVo.java
@@ -25,12 +25,14 @@
private String storeLon;
@ApiModelProperty("门店纬度")
private String storeLat;
- @ApiModelProperty("支付金额")
+ @ApiModelProperty("现金价格")
private Double payMoney;
+ @ApiModelProperty("玩湃币价格")
+ private Integer playPaiCoin;
@ApiModelProperty("预约时间")
private String appointment;
@ApiModelProperty("状态(0=待支付,1=待核销,2=已到店,3=已完成,4=已过期,5=已取消)")
private Integer status;
@ApiModelProperty("创建时间")
- private String insertTime;
+ private Long insertTime;
}
--
Gitblit v1.7.1