无意义提交，同步出现不一致的地方
diff --git a/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/Dictionary.java b/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/Dictionary.java
index 9725122..5cf1927 100644
--- a/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/Dictionary.java
+++ b/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/Dictionary.java
@@ -5,7 +5,6 @@
import javax.persistence.Table;
import com.supwisdom.leaveschool.common.domain.ABaseDomain;
-
/**
* 字典类
* @author Administrator
@@ -13,6 +12,7 @@
*/
@Entity
@Table(name = "TB_B_DICTIONARY")
+@org.hibernate.annotations.Table(appliesTo = "TB_B_DICTIONARY",comment="字典表")
public class Dictionary extends ABaseDomain {
@@ -22,29 +22,29 @@
*/
private static final long serialVersionUID = -7355785282419690119L;
- /**
- * 类型码
+ /**
+ * 字典代码
*/
- @Column(name = "CODE", unique = true)
+ @Column(name = "CODE", unique = true,columnDefinition="varchar(120) not null comment '字典代码'")
private String code;
/**
* 名称
*/
- @Column(name = "NAME")
+ @Column(name = "NAME",columnDefinition="varchar(200) not null comment '名称'")
private String name;
/**
* 是否可用
* 1 可用，0 不可用，默认：1
*/
- @Column(name = "ENABLED")
+ @Column(name = "ENABLED",columnDefinition="int(11) default 1 comment '是否可用'")
private boolean enabled = true;
/**
* 排序
*/
- @Column(name = "SORT")
+ @Column(name = "SORT",columnDefinition="int(11) comment '排序'")
private Integer sort;
/**
diff --git a/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/DictionaryType.java b/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/DictionaryType.java
index ad61c84..7b92ad1 100644
--- a/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/DictionaryType.java
+++ b/leaveschool/leaving/src/main/java/com/supwisdom/leaveschool/leaving/domain/basicdata/DictionaryType.java
@@ -13,6 +13,7 @@
*/
@Entity
@Table(name = "TB_B_DICTIONARY_TYPE")
+@org.hibernate.annotations.Table(appliesTo = "TB_B_DICTIONARY_TYPE",comment="字典类型表")
public class DictionaryType extends ABaseDomain {
@@ -25,20 +26,27 @@
/**
* 类型码
*/
- @Column(name = "CODE", unique = true)
+ @Column(name = "CODE", unique = true,columnDefinition="varchar(120) not null comment '类型码'")
private String code;
/**
* 名称
*/
- @Column(name = "NAME")
+ @Column(name = "NAME",columnDefinition="varchar(200) not null comment '名称'")
private String name;
/**
- * 是否可用，1 可用，0 不可用，默认：1
+ * 是否可用
+ * 1 可用，0 不可用，默认：1
*/
- @Column(name = "ENABLED")
+ @Column(name = "ENABLED",columnDefinition="int(11) default 1 comment '是否可用'")
private boolean enabled = true;
+
+ /**
+ * 排序
+ */
+ @Column(name = "SORT",columnDefinition="int(11) comment '排序'")
+ private Integer sort;
public String getCode() {
return code;
diff --git a/leaveschool/leaving/src/main/resources/application.yml b/leaveschool/leaving/src/main/resources/application.yml
index 8700f09..8b4ef7a 100644
--- a/leaveschool/leaving/src/main/resources/application.yml
+++ b/leaveschool/leaving/src/main/resources/application.yml
@@ -21,7 +21,7 @@
password: 111111
jpa:
hibernate:
- ddl-auto: update
+ ddl-auto: none
naming:
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect