From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master
---
src/main/java/com/whyc/pojo/db_ram_db/DeviceSetparam.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_ram_db/DeviceSetparam.java b/src/main/java/com/whyc/pojo/db_ram_db/DeviceSetparam.java
index a1fc1db..5864d8c 100644
--- a/src/main/java/com/whyc/pojo/db_ram_db/DeviceSetparam.java
+++ b/src/main/java/com/whyc/pojo/db_ram_db/DeviceSetparam.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_ram_db;
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 io.swagger.annotations.ApiModel;
@@ -32,7 +33,7 @@
private Long num;
@ApiModelProperty(value = "璁惧ID")
- private Long devId;
+ private Integer devId;
@ApiModelProperty(value = "杩滅▼鍛戒护")
private Integer opCmd;
@@ -83,7 +84,21 @@
private Integer diswaittime;
@ApiModelProperty(value = "鏍囩О瀹归噺")
- private Integer moncapstd;
+ private Float moncapstd;
+
+ @TableField(exist = false)
+ private String battgroupName;
+ @TableField(exist = false)
+ private String stationName;
+ @TableField(exist = false)
+ private String provice;
+ @TableField(exist = false)
+ private String city;
+ @TableField(exist = false)
+ private String country;
+ @TableField(exist = false)
+ private String fullName;
+
}
--
Gitblit v1.9.1