Merge branch 'feature/ribbon-menu-20240927' of http://1.92.128.200:3000/YXS/nmWATI into feature/ribbon-menu-20240927

# Conflicts: # .gitignore
1 changed files with 1 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,8 +3,8 @@ Bin/Release
 Bin/Temp
 build-*
 Src4/nmWTAI.pro.user
+Src4/build
 Src4/nmNum/nmNum.pro.user
-
 Src4/nmNum/nmData
 !Src4/nmNum/nmData/nmData.pro
 Src4/nmNum/nmPlot
Author	SHA1	Message	Date
zhangyin	c05bd645e3	Merge branch 'feature/ribbon-menu-20240927' of http://1.92.128.200:3000/YXS/nmWATI into feature/ribbon-menu-20240927	2 months ago
zhangyin	f98d4ca3d9	Merge branch 'feature/ribbon-menu-20240927' of http://1.92.128.200:3000/YXS/nmWATI into feature/ribbon-menu-20240927 # Conflicts: # .gitignore	2 months ago
zhangyin	cc9eeb6b03	1.忽略产生中间文件	2 months ago