zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into wumedical/v1

Browse Source 
# Conflicts:
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopStoreDao.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopStore.java
This commit is contained in:
wangjinlei
2024-03-21 09:25:48 +08:00
parent 66b9cb6a0b b68d7201d6
commit eb1a5c5f9b
25 changed files with 740 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/logback-spring.xml
View File

@@ -188,8 +188,8 @@
<springProfile name="dev,dev1">
<include resource="org/springframework/boot/logging/logback/base.xml" />
<!-- <logger name="org.springframework.web" level="DEBUG"/>-->
<!-- <logger name="org.springboot.sample" level="DEBUG" />-->
<logger name="org.springframework.web" level="DEBUG"/>
<logger name="org.springboot.sample" level="DEBUG" />
<logger name="com.peanut" level="DEBUG" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="DEBUG_FILE"/>