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		9 hours ago
..
Attributes	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
Common	Merge branch 'feature/nm-para-property-20260615' into develop	9 hours ago
Lang	fix(nmNum): 修复数值面板初始化和多段压裂水平井适配	1 week ago
Unit	feat:合并框架其他目录文件及代码	1 week ago
WTAI	feat:合并框架其他目录文件及代码	1 week ago