Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/readme.md
This commit is contained in:
马三炮 2025-08-27 10:30:35 +08:00
commit 77934f8e4b
1 changed files with 1 additions and 3 deletions

View File

@ -1,3 +1 @@
1.notMerge分支用于修改体检名称-施亮提出
2.不能与主分支master合并
3.更新日期 2025-06-30
1.主分支