Merge branch 'main' into dev

2026-01-26 09:31:44 +08:00 · 2026-01-24 11:35:42 +08:00 · 2026-01-24 11:03:26 +08:00 · 2026-01-23 20:19:04 +08:00 · 2026-01-23 09:17:58 +08:00 · 2026-01-23 09:12:31 +08:00
3 changed files with 3 additions and 3 deletions
--- a/.devops/config.yaml
+++ b/.devops/config.yaml
@ -1,7 +1,7 @@
 # DevOps 自动化部署配置文件
 # 全局分支配置（所有仓库统一使用此分支）
-global_branch: main
+global_branch: dev
 # 主仓库配置
 main_repository:
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e7a33e89a63a89b6ee4b661bd3a8d9bb893ee4d1
+Subproject commit 5ad6c2e9ee305d73bd598a7d5368ff4d80e63b38
--- a/ruoyi-modules/tuoheng-device
+++ b/ruoyi-modules/tuoheng-device
@ -1 +1 @@
-Subproject commit 1cf82176a79864bccb39122a68dc455f28b4a9c5
+Subproject commit 83827a953f439301351c952b82e1dd7edc44fe7d
Author	SHA1	Message	Date
孙小云	c79f3f6cab	Merge branch 'main' into dev	2026-01-26 09:31:44 +08:00
孙小云	9c015b387a	Merge branch 'main' into dev	2026-01-24 11:35:42 +08:00
孙小云	ac70605a30	Merge branch 'main' into dev	2026-01-24 11:03:26 +08:00
孙小云	0b7ebf29f5	xx	2026-01-23 20:19:04 +08:00
孙小云	9cbe3a0de0	修改分支	2026-01-23 09:17:58 +08:00
孙小云	aad4c9552c	xx	2026-01-23 09:12:31 +08:00
		`@ -1 +1 @@`
			`Subproject commit e7a33e89a63a89b6ee4b661bd3a8d9bb893ee4d1`				`Subproject commit 5ad6c2e9ee305d73bd598a7d5368ff4d80e63b38`
		`@ -1 +1 @@`
			`Subproject commit 1cf82176a79864bccb39122a68dc455f28b4a9c5`				`Subproject commit 83827a953f439301351c952b82e1dd7edc44fe7d`