6 Commits (4e4ccd94620d865318f97a2a38e4f1564022f413)

Author	SHA1	Message	Date
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	22 hours ago
lvjunjie	705e2f11f8	Merge branch 'feature/Model-20260625' into develop ... # Conflicts: # 3rd/Pebi/include/pch.h	2 days ago
lh	d7fa5676db	feat:合并框架其他目录文件及代码	1 week ago
lvjunjie	aa28668d9a	更新求解器	3 weeks ago
lvjunjie	1f0c44e270	更新求解器相关代码同步到develop	3 weeks ago
lh	34209bc128	feat:初始化仓库代码	2 months ago