YXS
/
nmWTAI-Platform
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
140 Commits
8 Branches
0 Tags
56 MiB
develop
feature/Model-20260625
feature/nm-para-property-20260615
feature/Merge-Framework-20260721
feature/ModelOpt20260526
feature/UI-20260528
feature/DialogBox-20260526
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f87ffafad9'
${ noResults }
Commit Graph

3 Commits (f87ffafad933619653a9b526aaf4bc75a11d6df6)

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
 14 hours ago
lh 4e574b76d6 fix:合并框架代码，已修复获取不到PVT数据的问题 2 months ago
lh 34209bc128 feat:初始化仓库代码 2 months ago