Compare commits

..

No commits in common. "de02aa38915d7f139edc3ff38345762b8fe57f3d" and "a589422315b90b90309657c8186bee354163f9e4" have entirely different histories.

2 changed files with 5 additions and 4 deletions

View File

@ -39,7 +39,9 @@ public class RegulationEntity extends AuditableEntity implements Serializable {
@TableField("content")
private String content;
@TableField(exist = false)
@ExcelProperty("制度类型")
@ApiModelProperty("制度类型")
@TableField("regulation_type")
private String type;
@ExcelProperty("制度状态")
@ -95,8 +97,7 @@ public class RegulationEntity extends AuditableEntity implements Serializable {
@ApiModelProperty("创建人姓名")
private String createByName;
@ExcelProperty("制度类型")
@TableField(exist = false)
@ApiModelProperty("制度类型")
@TableField("regulation_type")
private String regulationType;
}

View File

@ -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/test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://39.99.201.243:3306/znpt_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: BUw8YW6%@^8q
druid: