Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend

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;
 } 

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: