From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 6f0c4dc..1cf33fe 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,6 @@
 package cn.gistack.sm.sg.DO;
 
+import cn.gistack.sm.sg.VO.PreAcceVO;
 import cn.gistack.sm.sg.VO.SgTypeVO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -172,6 +173,10 @@
 
 	@TableField(exist = false)
 	private List<SgTypeVO> sgGxDOS;
+	@TableField(exist = false)
+	private List<PreAcceVO> preAcce;
+
+
 
 	private Integer status;
 
@@ -180,4 +185,14 @@
 
 	@TableField(exist = false)
 	private BigDecimal ProjectProgressNum;
+	@TableField(exist = false)
+	private String cityNm; //市
+	@TableField(exist = false)
+	private String countyNm; //县
+	@TableField(exist = false)
+	private String townNm; //乡
+	@TableField(exist = false)
+	private String engScal; //工程规模
+	@TableField(exist = false)
+	private String basGuid; //片区
 }

--
Gitblit v1.9.3