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.
nmWTAI-Platform/Src/nmNum
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
..
nmCalculation Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop 2 days ago
nmData Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop 2 days ago
nmDemo feat:合并框架其他目录文件及代码 4 weeks ago
nmGUI 修复带单位参数的数值回写 3 weeks ago
nmPlot 完善网格属性插值测点管理功能 2 weeks ago
nmSubWnd Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop 2 days ago
nmSubWxs Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop 2 days ago
nmXml feat:初始化仓库代码 3 months ago