Merge branch 'master' of http://121.40.234.130:7788/zhouz/beianxinsheng
# Conflicts: # wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java # wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
This commit is contained in:
@@ -8,7 +8,7 @@ nl:
|
||||
port: 3306
|
||||
username: root
|
||||
password: root
|
||||
database: nl-platform
|
||||
database: beian_xinsheng
|
||||
redis:
|
||||
ip: 127.0.0.1
|
||||
port: 6379
|
||||
|
||||
@@ -192,7 +192,7 @@ file:
|
||||
avatarMaxSize: 5
|
||||
logging:
|
||||
file:
|
||||
path: ${nl.config.logging-path}
|
||||
path: D:\log\beian\lms
|
||||
config: classpath:logback-spring.xml
|
||||
# sa-token白名单配置
|
||||
security:
|
||||
|
||||
Reference in New Issue
Block a user