From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java b/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
index e2c6e9b..a6e63e0 100644
--- a/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
+++ b/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
@@ -3,8 +3,7 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -18,7 +17,7 @@
  */
 @Data
 @TableName("water_record")
-@ApiModel
+@Schema
 public class WaterRecord {
 
 
@@ -30,21 +29,21 @@
     /**
      * 瑙勬牸鍨嬪彿
      */
-    @ApiModelProperty("瑙勬牸鍨嬪彿")
+    @Schema(description = "瑙勬牸鍨嬪彿")
     @Excel(name = "瑙勬牸鍨嬪彿")
     private String deviceModel;
 
     /**
      * 鐢ㄦ按绫诲瀷
      */
-    @ApiModelProperty("鐢ㄦ按绫诲瀷")
+    @Schema(description = "鐢ㄦ按绫诲瀷")
     @Excel(name = "鐢ㄦ按绫诲瀷", readConverterExp = "industrial=宸ヤ笟鐢ㄦ按,domestic=鐢熸椿鐢ㄦ按,fire=娑堥槻鐢ㄦ按,greening=缁垮寲鐢ㄦ按")
     private String type;
 
     /**
      * 璁惧鍚嶇О
      */
-    @ApiModelProperty("璁惧鍚嶇О")
+    @Schema(description = "璁惧鍚嶇О")
     @Excel(name = "璁惧鍚嶇О")
     @TableField(exist = false)
     private String deviceName;
@@ -54,21 +53,21 @@
     /**
      * 棰濆畾娴侀噺
      */
-    @ApiModelProperty("棰濆畾娴侀噺")
+    @Schema(description = "棰濆畾娴侀噺")
     @Excel(name = "棰濆畾娴侀噺")
     private String ratedRate;
 
     /**
      * 瀹為檯娴侀噺
      */
-    @ApiModelProperty("瀹為檯娴侀噺")
+    @Schema(description = "瀹為檯娴侀噺")
     @Excel(name = "瀹為檯娴侀噺")
     private String actualTraffic;
 
     /**
      * 杩愯鏃堕棿
      */
-    @ApiModelProperty("杩愯鏃堕棿")
+    @Schema(description = "杩愯鏃堕棿")
     @Excel(name = "杩愯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -78,28 +77,28 @@
     /**
      * 褰撴棩鐢ㄦ按閲�
      */
-    @ApiModelProperty("褰撴棩鐢ㄦ按閲�")
+    @Schema(description = "褰撴棩鐢ㄦ按閲�")
     @Excel(name = "褰撴棩鐢ㄦ按閲�")
     private String waterDay;
 
     /**
      * 姣忔棩闄愬埗姘撮噺
      */
-    @ApiModelProperty("姣忔棩闄愬埗姘撮噺")
+    @Schema(description = "姣忔棩闄愬埗姘撮噺")
     @Excel(name = "姣忔棩闄愬埗姘撮噺")
     private String waterDayLimit;
 
     /**
      * 姘磋垂鍗曚环
      */
-    @ApiModelProperty("姘磋垂鍗曚环")
+    @Schema(description = "姘磋垂鍗曚环")
     @Excel(name = "姘磋垂鍗曚环")
     private String waterPrice;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty("澶囨敞")
+    @Schema(description = "澶囨敞")
     private String remarks;
 
     /**
@@ -132,4 +131,7 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3