From 828c565974157bdda3f5c61dd857125d7790a67a Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 29 Oct 2019 14:29:14 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B0=81=E5=AD=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/CommonConstant.java | 4 + .../org/springblade/system/entity/Dict.java | 6 + .../springblade/system/mapper/DictMapper.xml | 2 +- doc/sql/mysql/bladex-saber-mysql.sql | 3 +- doc/sql/mysql/bladex-sword-mysql.sql | 21 ++-- doc/sql/oracle/bladex-saber-oracle.sql | 88 +++++++------- doc/sql/oracle/bladex-sword-oracle.sql | 108 +++++++++--------- .../postgresql/bladex-saber-postgresql.sql | 88 +++++++------- .../postgresql/bladex-sword-postgresql.sql | 105 ++++++++--------- doc/sql/update/mysql-update-2.0.7~2.1.0.sql | 25 ---- doc/sql/update/mysql-update-2.1.0~2.2.0.sql | 2 + doc/sql/update/oracle-update-2.0.7~2.1.0.sql | 25 ---- doc/sql/update/oracle-update-2.1.0~2.2.0.sql | 4 + .../update/postgresql-update-2.0.7~2.1.0.sql | 25 ---- .../update/postgresql-update-2.1.0~2.2.0.sql | 4 + 15 files changed, 233 insertions(+), 277 deletions(-) delete mode 100644 doc/sql/update/mysql-update-2.0.7~2.1.0.sql create mode 100644 doc/sql/update/mysql-update-2.1.0~2.2.0.sql delete mode 100644 doc/sql/update/oracle-update-2.0.7~2.1.0.sql create mode 100644 doc/sql/update/oracle-update-2.1.0~2.2.0.sql delete mode 100644 doc/sql/update/postgresql-update-2.0.7~2.1.0.sql create mode 100644 doc/sql/update/postgresql-update-2.1.0~2.2.0.sql diff --git a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java index 4fe16884..203a2318 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java @@ -90,6 +90,10 @@ public interface CommonConstant { */ String TOP_PARENT_NAME = "顶级"; + /** + * 未封存状态值 + */ + Integer NOT_SEALED_ID = 0; /** * 默认密码 diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java index 8dfe7834..68062c7a 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/entity/Dict.java @@ -85,6 +85,12 @@ public class Dict implements Serializable { @ApiModelProperty(value = "字典备注") private String remark; + /** + * 是否已封存 + */ + @ApiModelProperty(value = "是否已封存") + private Integer isSealed; + /** * 是否已删除 */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.xml index 37d3fbc3..cdad4740 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.xml @@ -46,7 +46,7 @@ -->