Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2020-06-12 abee95ff7de4b3514022b758044e77793f74896f

 kidgrow-config/src/main/resources/application.properties

@@ -93,4 +93,5 @@
mybatis-plus.global-config.db-config.logic-not-delete-value=0
# \u539F\u751F\u914D\u7F6E
mybatis-plus.configuration.map-underscore-to-camel-case=true
mybatis-plus.configuration.cache-enabled=false
mybatis-plus.configuration.cache-enabled=false