Commit Graph

7 Commits (028093bae4fa9ee0cc1a7c952c71c9a83ca904e5)

Author SHA1 Message Date
lh 028093bae4 fix(nmNum): 恢复数值模块参数系列标识 2 days ago
lh 47146b614f chore:合并新框架文件与代码。 2 days ago
lh 89425fbcc9 feat:合并新框架。 2 months ago
lvjunjie 34a82fe087 Merge branch 'feature/nm-para-property-20260615' into develop
# Conflicts:
#	3rd/Pebi/include/pch.h
#	Bin/Config/Common/MenuDefines_Ribbon_cn.dat   resolved by feature/nm-para-property-20260615 version
#	Bin/Config/Common/ModelParaDefinesNM_cn.dat   resolved by feature/nm-para-property-20260615 version
#	Bin/Config/Common/ModelParaDefinesNM_en.dat   resolved by feature/nm-para-property-20260615 version
#	Src/nmNum/nmData/nmDataAnalyzeManager.cpp
#	Src/nmNum/nmPlot/nmGuiPlot.cpp
#	Src/nmNum/nmPlot/nmObjPointWell.cpp
3 months ago
lh 129e7251fc feat:更新框架头文件 3 months ago
lh 4e574b76d6 fix:合并框架代码,已修复获取不到PVT数据的问题 4 months ago
lh 34209bc128 feat:初始化仓库代码 5 months ago