From 040b55329d1cb2f181e5033e552d38eba3f695fd Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 2 Mar 2022 17:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/system/entity/SysCategory.java | 3 +-- .../main/java/com/jero/modules/tag/entity/OnlCgformTag.java | 4 ++-- .../src/main/resources/application-prod.yml | 3 +++ .../src/main/resources/application.yml | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java index 1b85303bb..6e62a1240 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java @@ -76,8 +76,7 @@ public class SysCategory implements Serializable,Comparable{ private java.lang.String description; /**是否为标签内容-数据字典（1是 0否）*/ - @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict") - @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") private java.lang.Integer isTagDict; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index 76bd77087..d54afd7bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -82,8 +82,8 @@ public class OnlCgformTag implements Serializable { /**表单控件类型*/ - @Excel(name = "表单控件类型", width = 15,dictTable = "onl_cgform_field", dicText = "field_show_type",dicCode ="field_show_type") - @Dict(dictTable = "onl_cgform_field", dicText = "field_show_type",dicCode ="field_show_type") + @Excel(name = "表单控件类型", width = 15,dicCode ="field_show_type") + @Dict(dicCode ="field_show_type") @ApiModelProperty(value = "表单控件类型") private java.lang.String fieldShowType; diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index b7112cfad..3b58f5f1b 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -165,6 +165,9 @@ mybatis-plus: id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true + logic-delete-field: delFlag #默认deleted + logic-delete-value: 1 + logic-not-delete-value: 0 configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml index 36bcb2d39..693099072 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml @@ -4,5 +4,3 @@ spring: profiles: active: @profile.name@ -mybatis-plus: - mapper-locations: classpath:mappers/*.xml \ No newline at end of file