From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 33 +++++----------------------------
1 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
index 796d4a9..06c7c6e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
@@ -25,14 +25,14 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("t_settlement confirm")
+@TableName("t_settlement_confirm")
@ApiModel(value="TSettlementConfirm对象", description="")
public class TSettlementConfirm extends BasePojo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id")
private Long id;
@ApiModelProperty(value = "站点id")
@@ -58,7 +58,7 @@
@TableField("loss_electronic")
private BigDecimal lossElectronic;
@ApiModelProperty(value = "收入合计")
- @TableField("收入合计")
+ @TableField("income")
private BigDecimal income;
@ApiModelProperty(value = "场地费")
@@ -133,39 +133,16 @@
@TableField("coupon_discount")
private BigDecimal couponDiscount;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@ApiModelProperty(value = "类型（1=开始，2=结束）")
@TableField("type")
private Integer type;
@ApiModelProperty(value = "开始时间")
@TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime endTime;
@ApiModelProperty(value = "站点名称")
@TableField(exist = false)
--
Gitblit v1.7.1