修复进销存合并

yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java

@@ -4,7 +4,10 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
-@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module","co.yixiang"})
+@SpringBootApplication(scanBasePackages = {
+        "${yudao.info.base-package}.server", "${yudao.info.base-package}.module",
+        "co.yixiang", "com.zsw.erp"
+})
 public class YudaoServerApplication {
 
     public static void main(String[] args) {

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

@@ -60,6 +60,12 @@ spring:
           driver-class-name: com.mysql.jdbc.Driver
           username: root
           password: root
+        erp: # 进销存
+          name: erp
+          url: jdbc:mysql://192.168.10.250:3306/${spring.datasource.dynamic.datasource.erp.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT
+          driver-class-name: com.mysql.jdbc.Driver
+          username: root
+          password: root
 #        farm: # 农场数据源
 #          name: zsw-farm
 #          url: jdbc:mysql://192.168.10.129:3306/${spring.datasource.dynamic.datasource.farm.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT
@@ -225,4 +231,5 @@ justauth:
   cache:
     type: REDIS
     prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
-    timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
+    timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
+