4 Commits (ac7413680eb57e7a170507313f240c26db92f8b4)

Author	SHA1	Message	Date
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	3 weeks ago
lh	129e7251fc	feat:更新框架头文件	1 month ago
lh	4e574b76d6	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
lh	34209bc128	feat:初始化仓库代码	3 months ago