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
16 hours ago
lh f4be691783 fix: 断层、裂缝、区域、多边形、矩形和圆形图元的双击创建异常 2 months ago
lh 34209bc128 feat:初始化仓库代码 2 months ago