Merge remote-tracking branch 'refs/remotes/origin/main' into zzw
# Conflicts: # src/main/resources/application.yml
This commit is contained in:
@@ -5,9 +5,9 @@ spring:
|
|||||||
config:
|
config:
|
||||||
import: classpath:config/redis/redis-key.yml
|
import: classpath:config/redis/redis-key.yml
|
||||||
|
|
||||||
#mybatis-plus 配置
|
# MyBatis 配置
|
||||||
mybatis-plus:
|
mybatis:
|
||||||
mapper-locations: classpath:mapper/*.xml
|
mapper-locations: classpath:com/gis/xian/mapper/*.xml
|
||||||
type-aliases-package: com.gis.xian.entity
|
type-aliases-package: com.gis.xian.entity
|
||||||
configuration:
|
configuration:
|
||||||
map-underscore-to-camel-case: true
|
map-underscore-to-camel-case: true
|
||||||
|
|||||||
Reference in New Issue
Block a user