From 6958348fad1f68342235a7df57f10f348582c843 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 九月 2024 18:18:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 7bf9386..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 = "场地费")
--
Gitblit v1.7.1