new-20250827 解决合并冲突 #38

Merged

dyf merged 5 commits from liubiao/APP:new-20250827 into main 2026-03-19 11:42:41 +08:00

Conversation 0 Commits 5 Files Changed 23 +792 -418

5 Commits

Author	SHA1	Message	Date
liub	f86e6a4fb7	解决合并冲突 ... # Conflicts: # utils/BleReceive.js	2026-03-19 09:22:28 +08:00
liub	bb0610ff1a	Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827	2026-03-19 09:14:51 +08:00
liub	61f00e1cbf	修改7305人员信息取模组件，文本自动居中	2026-03-19 09:13:48 +08:00
liubiao	729f782c42	merge upstream	2026-03-18 15:24:52 +08:00
liub	ede41f68fd	蓝牙小优化，App隐藏时断开设备连接	2026-03-16 15:20:18 +08:00