标签内容修改

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<SysCategory>{
 	private java.lang.String description;
 
 	/**是否为标签内容-数据字典（1是 0否）*/
-	@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict")
+	@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
-	@Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")
 	@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
 	private java.lang.Integer isTagDict;
 

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")
+    @Excel(name = "表单控件类型", width = 15,dicCode ="field_show_type")
-    @Dict(dictTable = "onl_cgform_field", dicText = "field_show_type",dicCode ="field_show_type")
+    @Dict(dicCode ="field_show_type")
     @ApiModelProperty(value = "表单控件类型")
     private java.lang.String fieldShowType;
 

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

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