1 Commits (7204c54b072d36e0ee30671bdf74afb28a974c13)

Author	SHA1	Message	Date
lvjunjie	34a82fe087	Merge branch 'feature/nm-para-property-20260615' into develop ... # Conflicts: # 3rd/Pebi/include/pch.h # Bin/Config/Common/MenuDefines_Ribbon_cn.dat resolved by feature/nm-para-property-20260615 version # Bin/Config/Common/ModelParaDefinesNM_cn.dat resolved by feature/nm-para-property-20260615 version # Bin/Config/Common/ModelParaDefinesNM_en.dat resolved by feature/nm-para-property-20260615 version # Src/nmNum/nmData/nmDataAnalyzeManager.cpp # Src/nmNum/nmPlot/nmGuiPlot.cpp # Src/nmNum/nmPlot/nmObjPointWell.cpp	3 weeks ago