src/log4j.properties · b9ed059aaf5418eaf12ae4982de9d8385c694870 · zhangyusheng / YX_IDENT_REFACTORING

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev · 9bf5fff5

Administrator authored Dec 24, 2018

# Conflicts:
#	src/main/resources/static/tpl/layout/permissionList/permissionList.html
#	src/main/resources/static/tpl/layout/permissionList/permissionList.js
#	src/main/resources/static/tpl/layout/userList/userList.js

9bf5fff5

log4j.properties 1.36 KB

Replace log4j.properties