From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java
index 7f5b23d..945e21f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java
@@ -50,32 +50,46 @@
private String constructionPeriodDataPath;
/**
- * 除险加固资料路径
+ * 改扩建资料
*/
- @ApiModelProperty(value = "除险加固资料路径")
+ @ApiModelProperty(value = "改扩建资料")
+ @TableField("\"reconstruction_and_expansion_data\"")
+ private String reconstructionAndExpansionData;
+
+ /**
+ * 安全鉴定资料路径
+ */
+ @ApiModelProperty(value = "安全鉴定资料路径")
+ @TableField("\"safety_appraisal_data_path\"")
+ private String safetyAppraisalDataPath;
+
+ /**
+ * 除险加固报告资料路径
+ */
+ @ApiModelProperty(value = "除险加固报告资料路径")
@TableField("\"reinforce_data_path\"")
private String reinforceDataPath;
/**
- * 第一次除险加固资料路径
+ * 除险加固批复资料路径
*/
- @ApiModelProperty(value = "第一次除险加固资料路径")
- @TableField("\"first_reinforce_data_path\"")
- private String firstReinforceDataPath;
+ @ApiModelProperty(value = "除险加固批复资料路径")
+ @TableField("\"reinforce_approval_path\"")
+ private String reinforceApprovalPath;
/**
- * 第二次除险加固资料路径
+ * 调度规程资料路径
*/
- @ApiModelProperty(value = "第二次除险加固资料路径")
- @TableField("\"second_reinforce_data_path\"")
- private String secondReinforceDataPath;
+ @ApiModelProperty(value = "调度规程资料路径")
+ @TableField("\"dispatch_regulation_data_path\"")
+ private String dispatchRegulationDataPath;
/**
- * 第三次除险加固资料路径
+ * 调度规程批复资料路径
*/
- @ApiModelProperty(value = "第三次除险加固资料路径")
- @TableField("\"third_reinforce_data_path\"")
- private String thirdReinforceDataPath;
+ @ApiModelProperty(value = "调度规程批复资料路径")
+ @TableField("\"dispatch_regulation_approval_path\"")
+ private String dispatchRegulationApprovalPath;
/**
* 日常运行管理资料路径
@@ -99,6 +113,13 @@
private String waterAerialView;
/**
+ * 其他资料路径
+ */
+ @ApiModelProperty(value = "其他资料路径")
+ @TableField("\"other_data_path\"")
+ private String otherDataPath;
+
+ /**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
--
Gitblit v1.9.3