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.

lh 7204c54b07 Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop ... # Conflicts: # Bin/Config/Common/ModelParaDefinesNM_cn.dat resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version # Bin/Config/Common/ModelParaDefinesNM_en.dat resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version # Bin/Config/Common/UnitDefault_cn.dat resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version # Bin/Config/Lang/cn/nmNum_cn.qm resolved by develop version # Bin/XmlFiles/ModelParaDefinesNM_cn.xml # Bin/XmlFiles/ModelParaDefinesNM_en.xml # Src/nmNum/nmData/nmDataAutomaticFitting.cpp # Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp		2 days ago
..
BtnCmds_cn.xml	feat:合并框架其他目录文件及代码	4 weeks ago
BtnCmds_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
MenuDefines_Ribbon_cn.xml	更新属性插值菜单图标	2 weeks ago
MenuDefines_Ribbon_en.xml	更新属性插值菜单图标	2 weeks ago
ModelParaDefinesLP_cn.xml	feat:合并框架其他目录文件及代码	4 weeks ago
ModelParaDefinesLP_en.xml	feat:合并框架其他目录文件及代码	4 weeks ago
ModelParaDefinesNM_cn.xml	feat(nmNum): 按求解模型优化储层参数编辑	2 days ago
ModelParaDefinesNM_en.xml	feat(nmNum): 按求解模型优化储层参数编辑	2 days 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	Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop	2 days ago
UnitDefault_en.xml	更改渗透率的基准单位为Darcy	2 weeks ago
WTAI_Attributes_cn.xml	feat:初始化仓库代码	3 months ago
WTAI_Attributes_en.xml	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago