From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
index 8b182a3..37ff7b7 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
@@ -1,5 +1,7 @@
package cn.gistack.sm.sg.DO;
+import cn.gistack.sm.sg.VO.PreAcceVO;
+import cn.gistack.sm.sg.VO.PtypeVO;
import cn.gistack.sm.sg.VO.SgTypeVO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -80,12 +82,12 @@
private String expTime;
/**
- * 总承包
+ * 省厅建办
*/
private String generalContract;
/**
- * 总承包责任人
+ * 省厅建办责任人
*/
private String generalPerson;
@@ -110,32 +112,32 @@
private String controlPerson;
/**
- * 施工单位
+ * 土建施工单位
*/
private String constructionUnit;
/**
- * 施工单位责任人
+ * 土建施工单位责任人
*/
private String constructionPerson;
/**
- * 施工自检单位
+ * 设备施工单位
*/
private String selfUnit;
/**
- * 施工自检单位责任人
+ * 设备施工单位责任人
*/
private String selfPerson;
/**
- * 竣工验收检测单位
+ * 检测单位
*/
private String acceptanceUnit;
/**
- * 竣工验收检测单位责任人
+ * 检测单位责任人
*/
private String acceptancePerson;
@@ -171,7 +173,11 @@
@TableField(exist = false)
- private List<SgTypeVO> sgGxDOS;
+ private List<PtypeVO> ptypeVOS;
+ @TableField(exist = false)
+ private List<PreAcceVO> preAcce;
+
+
private Integer status;
@@ -190,4 +196,10 @@
private String engScal; //工程规模
@TableField(exist = false)
private String basGuid; //片区
+
+ /**
+ * 标段
+ */
+ private String lot;
+
}
--
Gitblit v1.9.3