From 080b6ef99a53e35fc2c1fd5b4a3ef84e0656c98c Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 16:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
index 4d2a8f4..2df3032 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotBlank;
@@ -30,7 +31,7 @@
* 璁惧鐮�
*/
@NotBlank(message="璁惧鐮佷笉鑳戒负绌�")
- public String equipNo;
+ public String deviceNo;
/**
* 鐢熶骇鐧诲綍id
*/
@@ -63,7 +64,7 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
/**
* 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
@@ -74,9 +75,9 @@
*/
public Integer result;
/**
- * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
+ * 缁翠慨鑺傜偣杩斿洖鐨勯敊淇℃伅
*/
- public String errorCode;
+ public String errorMsg;
/**
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
@@ -99,5 +100,12 @@
*/
public String memo;
-
+ @TableField(exist = false)
+ public String planName;
+ @TableField(exist = false)
+ public String stationName;
+ @TableField(exist = false)
+ public String updateUserName;
+ @TableField(exist = false)
+ public String assistantNames;
}
--
Gitblit v1.8.0