dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
liubiao commented 2026-03-19 09:23:11 +08:00
Collaborator
Copy Link
No description provided.
liubiao added 5 commits 2026-03-19 09:23:12 +08:00
蓝牙小优化，App隐藏时断开设备连接 ede41f68fd
merge upstream 729f782c42
修改7305人员信息取模组件，文本自动居中 61f00e1cbf
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 bb0610ff1a
解决合并冲突 f86e6a4fb7 
# Conflicts:
#	utils/BleReceive.js
dyf merged commit a2680fc14d into main 2026-03-19 11:42:41 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
chenyouting fengerli liubiao zhuhongkui dyf
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: dyf/APP#38
No description provided.
Delete Branch "liubiao/APP:new-20250827"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?