From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
new file mode 100644
index 0000000..ee01b72
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
@@ -0,0 +1,64 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 账单水电费子表
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_bill_detail")
+@ApiModel(value="TBillDetail对象", description="账单水电费子表")
+public class TBillDetail extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "账单id")
+ @TableField("bill_id")
+ private String billId;
+
+ @ApiModelProperty(value = "初始读数")
+ @TableField("start_reading")
+ private BigDecimal startReading;
+
+ @ApiModelProperty(value = "结束读数")
+ @TableField("end_reading")
+ private BigDecimal endReading;
+
+ @ApiModelProperty(value = "使用量")
+ @TableField("usage_measure")
+ private BigDecimal usageMeasure;
+
+ @ApiModelProperty(value = "单价")
+ @TableField("unit_price")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty(value = "总金额")
+ @TableField("total_amount")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "费用类型 1=水费 2=电费")
+ @TableField("live_type")
+ private Integer liveType;
+
+}
--
Gitblit v1.7.1