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.

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		12 hours ago
..
nmFrameworkTest.h	feat:初始化仓库代码	2 months ago
nmSubWndDataAnalyzeController.h	支持气井数据集拟压力转换	2 days ago
nmSubWndDemo.h	feat:初始化仓库代码	2 months ago
nmSubWndGrid.h	关闭网格界面时，清理网格数据	2 months ago
nmSubWndMain.h	Revert "修复切换成果后下拉框和曲线显示错误的问题"	2 months ago
nmSubWndPostprocessing.h	feat:初始化仓库代码	2 months ago
nmSubWndSubWxsAnalyzeController.h	feat:初始化仓库代码	2 months ago
nmSubWndUtils.h	Merge branch 'feature/nm-para-property-20260615' into develop	12 hours ago
nmSubWnd_global.h	feat:初始化仓库代码	2 months ago