From d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 23:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

---
 src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java b/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java
index 06a3fd0..d9c42d4 100644
--- a/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java
+++ b/src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java
@@ -1,6 +1,7 @@
 package com.whyc.pojo.db_param;
 
 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;
@@ -41,11 +42,17 @@
     @ApiModelProperty(value = "涓诲瓧娈电被鍨媅1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉  4:鐢垫睜 5:璁惧]")
     private Integer mainFieldType;
 
+    @TableField(exist = false)
+    private String mainFieldTypeName;
+
     @ApiModelProperty(value = "娆¤瀛楁1鍙傝�冮厤缃�")
     private String minorField1;
 
     @ApiModelProperty(value = "瀛楁1绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉  4:鐢垫睜 5:璁惧]")
     private Integer minorField1Type;
+
+    @TableField(exist = false)
+    private String minorField1TypeName;
 
     @ApiModelProperty(value = "娆¤瀛楁2鍙傝�冮厤缃�")
     private String minorField2;
@@ -53,17 +60,26 @@
     @ApiModelProperty(value = "瀛楁2绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉  4:鐢垫睜 5:璁惧]")
     private Integer minorField2Type;
 
+    @TableField(exist = false)
+    private String minorField2TypeName;
+
     @ApiModelProperty(value = "娆¤瀛楁3鍙傝�冮厤缃�")
     private String minorField3;
 
     @ApiModelProperty(value = "瀛楁3绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉  4:鐢垫睜 5:璁惧]")
     private Integer minorField3Type;
 
+    @TableField(exist = false)
+    private String minorField3TypeName;
+
     @ApiModelProperty(value = "娆¤瀛楁4鍙傝�冮厤缃�")
     private String minorField4;
 
     @ApiModelProperty(value = "瀛楁4绫诲瀷[1:鐩存祦锛�2锛氶�氫俊锛�3閰嶇綉  4:鐢垫睜 5:璁惧]")
     private Integer minorField4Type;
 
+    @TableField(exist = false)
+    private String minorField4TypeName;
+
 
 }

--
Gitblit v1.9.1