Skip to content

Y
yifu-mvp
Commit 3e6c8bc9 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge branch 'MVP1.5.6-salaryBack' into MVP1.5.6 

# Conflicts:
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
#	yifu-salary/yifu-salary-biz/src/main/resources/logback-spring.xml
parents c6e36e65 81165eef
Expand all Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 144 deletions
yifu-salary/yifu-salary-biz/src/main/resources/logback-spring.xml
View file @ 3e6c8bc9
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</logger> </logger>
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="debug"> <root level="error">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
......
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