9 Commits (1f31b3c1df226d4e78693c73e8858e82cc4652f5)

Author	SHA1	Message	Date
wenjy	1f31b3c1df	change - 冲突解决	10 months ago
wenjy	8ac6266f5a	change - 报警、用电数据采集修改	10 months ago
liulb@mesnac.com	346821a670	。	10 months ago
liulb@mesnac.com	24f9e0ef94	change 箱体发泡	10 months ago
liuwf	7ff5afa6c9	。	10 months ago
liuwf	441bddc506	change-分垛改货道型号设置，下线开放69码校验功能	10 months ago
wenjy	d543bd47ab	change - 数据采集初始化异常处理	10 months ago
wenjy	80855072cf	change - 修改数据采集模块，添加箱壳、内胆、泡后数据采集	10 months ago
wenjy	9e6a3fb382	add - 添加设备采集模块	10 months ago