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		15 hours ago
..
BtnCmds_cn.xml	feat:合并框架其他目录文件及代码	1 week ago
BtnCmds_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
MenuDefines_Ribbon_cn.xml	feat:合并框架其他目录文件及代码	1 week ago
MenuDefines_Ribbon_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
ModelParaDefinesLP_cn.xml	feat:合并框架其他目录文件及代码	1 week ago
ModelParaDefinesLP_en.xml	feat:合并框架其他目录文件及代码	1 week ago
ModelParaDefinesNM_cn.xml	Merge branch 'feature/nm-para-property-20260615' into develop	15 hours ago
ModelParaDefinesNM_en.xml	Merge branch 'feature/nm-para-property-20260615' into develop	15 hours ago
NmXmlDemo_cn.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
NmXmlDemo_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
TableStructs_cn.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
TableStructs_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
UnitDefault_cn.xml	feat:合并框架其他目录文件及代码	1 week ago
UnitDefault_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
WTAI_Attributes_cn.xml	feat:初始化仓库代码	2 months ago
WTAI_Attributes_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago