zhuoning 1c5409ce9b Merge branch 'master' of D:\idea4\huimv.farm.datacenter with conflicts. %!s(int64=2) %!d(string=hai) anos
..
doc 8e9cb1837a 接收器电子秤和环境监测数据已经完成代码的重构迁移。 %!s(int64=3) %!d(string=hai) anos
src 6b3d639921 添加摄像头回放 %!s(int64=2) %!d(string=hai) anos
pom.xml 1c5409ce9b Merge branch 'master' of D:\idea4\huimv.farm.datacenter with conflicts. %!s(int64=2) %!d(string=hai) anos