Merge branch 'dev_ai' of http://114.132.189.42:9002/r/product-inventory-management into ywx