Commit 9290c714 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/master'

parents 6245f999 25a33de1
...@@ -26,7 +26,7 @@ mybatis-plus: ...@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value: 0 logic-not-delete-value: 0
configuration: configuration:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置 # spring security 配置
security: security:
......
...@@ -83,7 +83,7 @@ public class BaseEntity implements Serializable { ...@@ -83,7 +83,7 @@ public class BaseEntity implements Serializable {
*/ */
@TableField(exist = false) @TableField(exist = false)
@ExcelIgnore @ExcelIgnore
@JsonIgnore //@JsonIgnore
private String menuInfo; private String menuInfo;
/** /**
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<groupId>com.yifu.cloud.plus.v1</groupId> <groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu</artifactId> <artifactId>yifu</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>yifu-mail-api</artifactId> <artifactId>yifu-mail-api</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment