Merge remote-tracking branch 'zzb/master'
调整冲突错误
Merge branch 'master' of https://github.com/2Tiramisu/wms_rfid_mdj.git
PositionCapacity列增加
Signed-off-by: Endis <zhengzhibin@skyseaok.com>