BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !629 from Youkehai/master

Merge pull request !630 from dhb52/master

Merge pull request !626 from samisgod/master

 Conflicts:
	README.md

Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>

2. 修复 xss 无法禁用的问题

2. 减少日志打印

目的：优化启动速度

2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的：提升项目的启动速度

# Conflicts:
#	yudao-dependencies/pom.xml

 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java