Merge remote-tracking branch 'origin/master'

yifu-archives/yifu-archives-biz/src/main/resources/application.yml

@@ -26,7 +26,7 @@ mybatis-plus:
       logic-not-delete-value: 0
   configuration:
     map-underscore-to-camel-case: true
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 # spring security 配置
 security:

yifu-common/yifu-common-mybatis/src/main/java/com/yifu.cloud.plus.v1/yifu/common/mybatis/base/BaseEntity.java

@@ -83,7 +83,7 @@ public class BaseEntity implements Serializable {
 	 */
 	@TableField(exist = false)
 	@ExcelIgnore
-	@JsonIgnore
+	//@JsonIgnore
 	private String menuInfo;
 
 	/**

yifu-mail/yifu-mail-api/pom.xml

@@ -8,6 +8,7 @@
 		<groupId>com.yifu.cloud.plus.v1</groupId>
 		<artifactId>yifu</artifactId>
 		<version>1.0.0</version>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>yifu-mail-api</artifactId>