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.h	1.增加压裂井裂缝半长拟合参数 2.参数物理边界统一用框架中的	6 days ago
nmCalculationDefine.h	feat:初始化仓库代码	3 months ago
nmCalculationDllPebiSolverTask.h	优化多井自动拟合求解流程	2 weeks ago
nmCalculationPebiGrid.h	关闭网格界面时，清理网格数据	3 months ago
nmCalculationPebiGridTask.h	feat:初始化仓库代码	3 months ago
nmCalculationUtils.h	refactor(nmNum): 统一渗透率基准单位为 mD	6 days ago
nmCalculation_global.h	feat:初始化仓库代码	3 months ago