zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
#	ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-ui/src/views/bas/traycode/index.vue
This commit is contained in:
1009473166@qq.com
2026-07-31 10:18:33 +08:00
parent af4c0a274d 6bff484432
commit 73dc413e03
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT546-WMS;encrypt=false; url: jdbc:sqlserver://192.168.188.236:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
username: sa username: sa
password: 123456 password: Flrd0914.
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭