6 Commits (0afcfaa6cacf20ce81232f834d717dde1a600257)

Author	SHA1	Message	Date
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
lh	c11454e4a7	fix(nmNum): 修复压裂井参数单位绑定 ... - 将排水角度和裂缝角度单位统一为 deg - 补充 mD.m 流动能力单位组 - 修复裂缝角度和导流能力数值显示为空的问题	6 days ago
lvjunjie	f0d90f9513	更改渗透率的基准单位为Darcy	2 weeks ago
lvjunjie	0a1350b188	统一渗透率和井筒储集系数单位 ... - 将渗透率显示单位统一为 mD - 将井筒储集系数单位统一为 m^3/MPa - 更新中英文参数配置及加密数据文件	3 weeks ago
lh	d7fa5676db	feat:合并框架其他目录文件及代码	4 weeks ago
lh	4e574b76d6	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago