From 0662bc9d20a0cb613ea9c311b78648375fb531f9 Mon Sep 17 00:00:00 2001
From: liuyuan <18551621088@163.com>
Date: Mon, 15 Jul 2024 15:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szr/zdryztpg/model/ZdryztpgExportModel.java    | 36 +++++++++++-----------
 src/main/resources/bootstrap-prod.yml              | 12 ++++----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java
index 6d47c78..af36a88 100644
--- a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java
+++ b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java
@@ -25,58 +25,62 @@ public class ZdryztpgExportModel {
     @ColumnWidth(12)
     private String rylx;
 
-    @ExcelProperty(value = "身份号码" ,index = 1)
+    @ExcelProperty(value = "管控类型" ,index = 1)
+    @ColumnWidth(12)
+    private String gklx;
+
+    @ExcelProperty(value = "身份号码" ,index = 2)
     @ColumnWidth(12)
     private String sfzhm;
 
-    @ExcelProperty(value = "姓名" ,index = 2)
+    @ExcelProperty(value = "姓名" ,index = 3)
     private String ryxm;
 
-    @ExcelProperty(value = {"风险评估", "填写内容"} ,index = 3)
+    @ExcelProperty(value = {"风险评估", "填写内容"} ,index = 4)
     @ColumnWidth(12)
     private String fxpgtxnr;
 
-    @ExcelProperty(value = {"风险评估", "检查结果"} ,index = 4)
+    @ExcelProperty(value = {"风险评估", "检查结果"} ,index = 5)
     @ColumnWidth(12)
     private String fxpgjcjg;
 
-    @ExcelProperty(value = {"现实表现", "填写内容"} ,index = 5)
+    @ExcelProperty(value = {"现实表现", "填写内容"} ,index = 6)
     @ColumnWidth(12)
     private String xsbxtxnr;
 
-    @ExcelProperty(value = {"现实表现", "检查结果"} ,index = 6)
+    @ExcelProperty(value = {"现实表现", "检查结果"} ,index = 7)
     @ColumnWidth(12)
     private String xsbxjcjg;
 
-    @ExcelProperty(value = {"活动地", "填写内容"} ,index = 7)
+    @ExcelProperty(value = {"活动地", "填写内容"} ,index = 8)
     @ColumnWidth(12)
     private String hdztxnr;
 
-    @ExcelProperty(value = {"活动地", "检查结果"} ,index = 8)
+    @ExcelProperty(value = {"活动地", "检查结果"} ,index = 9)
     @ColumnWidth(12)
     private String hdzjcjg;
 
-    @ExcelProperty(value = {"在控情况", "填写内容"} ,index = 9)
+    @ExcelProperty(value = {"在控情况", "填写内容"} ,index = 10)
     @ColumnWidth(12)
     private String zkqktxnr;
 
-    @ExcelProperty(value = {"在控情况", "检查结果"} ,index = 10)
+    @ExcelProperty(value = {"在控情况", "检查结果"} ,index = 11)
     @ColumnWidth(12)
     private String zkqkjcjg;
 
-    @ExcelProperty(value = {"现实表现近三次情况", "填写内容"} ,index = 11)
+    @ExcelProperty(value = {"现实表现近三次情况", "填写内容"} ,index = 12)
     @ColumnWidth(14)
     private String jscqktxnr;
 
-    @ExcelProperty(value = {"现实表现近三次情况", "检查结果"} ,index = 12)
+    @ExcelProperty(value = {"现实表现近三次情况", "检查结果"} ,index = 13)
     @ColumnWidth(14)
     private String jscqkjcjg;
 
-    @ExcelProperty(value = {"是否见面&现实表现", "填写内容"} ,index = 13)
+    @ExcelProperty(value = {"是否见面&现实表现", "填写内容"} ,index = 14)
     @ColumnWidth(12)
     private String sfjmtxnr;
 
-    @ExcelProperty(value = {"是否见面&现实表现", "检查结果"} ,index = 14)
+    @ExcelProperty(value = {"是否见面&现实表现", "检查结果"} ,index = 15)
     @ColumnWidth(12)
     private String sfjmjcjg;
 
@@ -86,10 +90,6 @@ public class ZdryztpgExportModel {
     @ExcelIgnore
     private String xsbxfxpgjcjg;
 
-    @ExcelProperty(value = "管控类型" ,index = 15)
-    @ColumnWidth(12)
-    private String gklx;
-
     @ExcelProperty(value = {"附件", "附件名称"} ,index = 16)
     @ColumnWidth(12)
     private String fjmc;
diff --git a/src/main/resources/bootstrap-prod.yml b/src/main/resources/bootstrap-prod.yml
index 12e6f64..765e144 100644
--- a/src/main/resources/bootstrap-prod.yml
+++ b/src/main/resources/bootstrap-prod.yml
@@ -2,17 +2,17 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 50.34.174.7:8848
-        namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a
+#        server-addr: 50.34.174.7:8848
+#        namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a
 #                鼓楼
-#        server-addr: 50.32.58.101:8848
-#        namespace: e2cee560-834b-4de8-9603-71100a82ba79
+        server-addr: 50.32.58.101:8848
+        namespace: e2cee560-834b-4de8-9603-71100a82ba79
         group: DEFAULT_GROUP
       config:
-        namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a
+        namespace: e2cee560-834b-4de8-9603-71100a82ba79
         group: DEFAULT_GROUP
         # 配置中心的地址
-        server-addr: 50.34.174.7:8848
+        server-addr: 50.32.58.101:8848
         # 默认加载与服务名相同文件 优先级最高
         prefix: ${spring.application.name}
         file-extension: yaml