From 2d338a0e7480330ecb78e6d5471c2f47867b0a80 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SetupBillingModel.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SetupBillingModel.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SetupBillingModel.java
index 7985365..e9f2d71 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SetupBillingModel.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SetupBillingModel.java
@@ -2,6 +2,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import java.math.BigDecimal;
@@ -13,8 +14,8 @@
@Data
@Document(collection = "setup_billing_model") //指定要对应的文档名(表名)
@Accessors(chain = true)
-public class SetupBillingModel {
-
+public class SetupBillingModel extends BaseModel {
+ @Id
private String charging_pile_code; //桩编码
private String billing_model_code; // 计费模型编号
private BigDecimal sharp_peak_electricity_rate; // 尖费电费费率(精确到五位小数)
--
Gitblit v1.7.1