From 854d311307b508d4424af6ca97a5c5159c2e2392 Mon Sep 17 00:00:00 2001
From: wangna0328 <3402195679@qq.com>
Date: Wed, 6 Aug 2025 17:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B6=E5=BA=A6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dite/znpt/domain/entity/RegulationEntity.java | 7 +++----
 web/src/main/resources/application-dev.yml                 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java
index 6dd36f1..b7e4845 100644
--- a/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java
+++ b/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java
@@ -39,9 +39,7 @@ public class RegulationEntity extends AuditableEntity implements Serializable {
     @TableField("content")
     private String content;
 
-    @ExcelProperty("制度类型")
-    @ApiModelProperty("制度类型")
-    @TableField("regulation_type")
+    @TableField(exist = false)
     private String type;
 
     @ExcelProperty("制度状态")
@@ -97,7 +95,8 @@ public class RegulationEntity extends AuditableEntity implements Serializable {
     @ApiModelProperty("创建人姓名")
     private String createByName;
 
-    @TableField(exist = false)
+    @ExcelProperty("制度类型")
     @ApiModelProperty("制度类型")
+    @TableField("regulation_type")
     private String regulationType;
 } 
\ No newline at end of file
diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml
index 24e7b09..032b3f3 100644
--- a/web/src/main/resources/application-dev.yml
+++ b/web/src/main/resources/application-dev.yml
@@ -14,7 +14,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.99.201.243:3306/znpt_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://39.99.201.243:3306/test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: BUw8YW6%@^8q
     druid: