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 1d5c0bfdb6 Merge branch 'feature/MultiWellAutoFit-20260805' into develop ... # Conflicts: # Bin/Config/Lang/cn/nmNum_cn.qm resolved by feature/MultiWellAutoFit-20260805 version		3 days ago
..
nmFrameworkTest.cpp	feat:初始化仓库代码	3 months ago
nmSubWndDataAnalyzeController.cpp	支持气井数据集拟压力转换	3 weeks ago
nmSubWndDemo.cpp	feat:初始化仓库代码	3 months ago
nmSubWndGrid.cpp	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
nmSubWndMain.cpp	Merge branch 'feature/MultiWellAutoFit-20260805' into develop	3 days ago
nmSubWndPostprocessing.cpp	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
nmSubWndSubWxsAnalyzeController.cpp	Merge branch 'feature/nm-para-property-20260615' into develop	3 weeks ago
nmSubWndUtils.cpp	Merge branch 'feature/nm-para-property-20260615' into develop	3 weeks ago