From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-server/src/main/resources/application-local.yaml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index eaf06ab..61026f9 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -65,7 +65,7 @@
primary: master
datasource:
master:
- url: jdbc:mysql://localhost:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ url: jdbc:mysql://localhost:3306/mom-xgdl?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
username: root
password: 123456
@@ -75,7 +75,7 @@
host: localhost # 鍦板潃
port: 6379 # 绔彛
database: 0 # 鏁版嵁搴撶储寮�
-# password: # 瀵嗙爜锛屽缓璁敓浜х幆澧冨紑鍚�
+# password: 123456
--- #################### 瀹氭椂浠诲姟鐩稿叧閰嶇疆 ####################
@@ -198,3 +198,9 @@
compress: true # 鏄惁鍘嬬缉鍥剧墖
need-compress-size: 10MB # 瑙﹀彂鍘嬬缉鐨勬枃浠跺ぇ灏忛槇鍊�
compress-quality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
+
+# MES 鏁伴噰锛堣澶囨暟鎹噰闆嗭級閰嶇疆锛屽閮ㄦ暟閲囨湇鍔″湴鍧�鎸夊疄闄呴儴缃插～鍐�
+ mes:
+ telemetry:
+ base-url: http://106.227.91.252:3100 # 鏁伴噰鏈嶅姟鍦板潃
+ path: /api/jxjs/mesTb/getDeviceDetails
--
Gitblit v1.9.3