BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !1492 from Jarrett/fix-sku-sales-count

@Select注解不会应用autoResultMap，需手动指定@Results和typeHandler：
- ProductSpuMapper: sliderPicUrls字段添加JacksonTypeHandler
- ProductSkuMapper: properties字段添加JacksonTypeHandler

…tps%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel

2. 优化 trace 相关的逻辑

 Conflicts:
	src/main/resources/application-local.yaml

 Conflicts:
	src/main/resources/application.yaml

梳理 druid 的配置

 Conflicts:
	pom.xml
	src/main/resources/application-local.yaml

 Conflicts:
	src/test/resources/sql/clean.sql
	src/test/resources/sql/create_tables.sql

 Conflicts:
	src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java

完成 YunpianSmsClient 的单元测试