hym 06b2379cd0 Merge remote-tracking branch 'origin/master' %!s(int64=4) %!d(string=hai) anos
..
src 06b2379cd0 Merge remote-tracking branch 'origin/master' %!s(int64=4) %!d(string=hai) anos
pom.xml e238dafecc 设备类型同步 %!s(int64=4) %!d(string=hai) anos