Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
61477e7923
|
|
@ -7,7 +7,12 @@ spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: dev
|
active: dev
|
||||||
include: tools
|
include: tools
|
||||||
|
wx:
|
||||||
|
ysk:
|
||||||
|
appId: wx212769170d2c6b2a
|
||||||
|
secrete: 8492a7e8d55bbb1b57f5c8276ea1add0
|
||||||
|
operationMsgTmpId: wFdoUG-dUT7bDRHq8bMJD9CF5TjyH9x_uJQgQByZqHg
|
||||||
|
warnMsgTmpId: C08OUr80x6wGmUN1zpFhSQ3Sv7VF5vksdZigiEx2pD0
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
config: classpath:logback.xml
|
config: classpath:logback.xml
|
||||||
|
|
@ -22,3 +27,5 @@ mybatis-flex:
|
||||||
pagehelper:
|
pagehelper:
|
||||||
helper-dialect: mysql
|
helper-dialect: mysql
|
||||||
support-methods-arguments: true
|
support-methods-arguments: true
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue