Merge branch 'dev_product_scan' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_product_scan
