You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nmWTAI-Platform/Src/nmNum/nmSubWnd
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
11 hours ago
..
nmFrameworkTest.cpp feat:初始化仓库代码 2 months ago
nmSubWndDataAnalyzeController.cpp 支持气井数据集拟压力转换 2 days ago
nmSubWndDemo.cpp feat:初始化仓库代码 2 months ago
nmSubWndGrid.cpp fix:合并框架代码,已修复获取不到PVT数据的问题 2 months ago
nmSubWndMain.cpp Merge branch 'feature/nm-para-property-20260615' into develop 11 hours ago
nmSubWndPostprocessing.cpp fix:合并框架代码,已修复获取不到PVT数据的问题 2 months ago
nmSubWndSubWxsAnalyzeController.cpp Merge branch 'feature/nm-para-property-20260615' into develop 11 hours ago
nmSubWndUtils.cpp Merge branch 'feature/nm-para-property-20260615' into develop 11 hours ago