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		4 days ago
..
Framework_cn.qm	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
Framework_cn.ts	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
MPA_cn.qm	恢复框架代码	4 days ago
MPA_cn.ts	恢复框架代码	4 days ago
WTAI_cn.qm	feat:合并框架其他目录文件及代码	1 month ago
WTAI_cn.ts	恢复框架代码	4 days ago
nmNum_cn.qm	feat(nmNum): 按求解模型优化储层参数编辑	4 days ago
nmNum_cn.ts	Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop	4 days ago
qt_zh_CN.qm	feat:初始化仓库代码	3 months ago
qt_zh_CN.ts	feat:初始化仓库代码	3 months ago
qtbase_zh_CN.qm	feat:初始化仓库代码	3 months ago