merge master change

yudao-admin-server/src/main/resources/application.yaml

@@ -32,7 +32,6 @@ mybatis-plus:
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
   mapper-locations: classpath*:mapper/*.xml
-  type-aliases-package: ${yudao.info.base-package}.modules.*.dal.dataobject
   config-location: classpath:mybatis-config/mybatis-config.xml
   configuration-properties:
     prefix: ""
@@ -45,6 +44,7 @@ mybatis-plus:
     orderBy: "order by ${orderByColumns}"
     blobType: "BLOB"
     boolValue: "TRUE"
+  type-aliases-package: ${yudao.info.base-package}.modules.*.dal.dataobject, ${yudao.core-service.base-package}.modules.*.dal.dataobject
 
 --- #################### 芋道相关配置 ####################
 
@@ -52,6 +52,8 @@ yudao:
   info:
     version: 1.0.0
     base-package: cn.iocoder.yudao.adminserver
+  core-service:
+    base-package: cn.iocoder.yudao.coreservice
   web:
     api-prefix: /api
     controller-package: ${yudao.info.base-package}