SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into bgy

Browse Source 
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
#	ruoyi-system/pom.xml
This commit is contained in:
gy b
2024-01-05 15:13:25 +08:00
parent 8a9cdd09fc 2e3c6764c3
commit f59b1eea7c
105 changed files with 377 additions and 14706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
+2 -5
View File
@@ -1,6 +1,5 @@
package com.ruoyi.framework.config;
import java.util.TimeZone;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -17,14 +16,12 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径
@MapperScan("com.ruoyi.**.mapper")
public class ApplicationConfig
{
public class ApplicationConfig {
/**
* 时区配置
*/
@Bean
public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
{
public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
// return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone("Asia/Shanghai");
}