Commit Graph

4 Commits (bf82abbf729c7a0efd2b8b1a3960b0511c7d517f)

Author SHA1 Message Date
lh d8af516478 Merge branch 'feature/refactor-numerical-model-panel-20260824' into develop 2 weeks 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
1 month ago
lvjunjie 0fd1b04108 对话框类改为继承iDlgBase 4 months ago
lh 34209bc128 feat:初始化仓库代码 4 months ago