zhuoning d042f2b2cc Merge branch 'master' of D:\idea6\huimv.env.platform with conflicts. %!s(int64=2) %!d(string=hai) anos
..
src b8f93b1db6 Merge remote-tracking branch 'origin/master' %!s(int64=2) %!d(string=hai) anos
target d042f2b2cc Merge branch 'master' of D:\idea6\huimv.env.platform with conflicts. %!s(int64=2) %!d(string=hai) anos
pom.xml 34e5d7cef4 新建传感器注册功能。 %!s(int64=2) %!d(string=hai) anos