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		3 days ago
..
nmCalculationAutoFitPSO.cpp	删除候选评价中的参数专属硬编码阈值。	5 days ago
nmCalculationDllPebiSolverTask.cpp	Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop	3 days ago
nmCalculationPebiGrid.cpp	refactor(nmNum): 统一渗透率基准单位为 mD	6 days ago
nmCalculationPebiGridTask.cpp	feat:初始化仓库代码	3 months ago
nmCalculationUtils.cpp	refactor(nmNum): 统一渗透率基准单位为 mD	6 days ago