Merge remote-tracking branch 'origin/dev' into bug

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_ctrl.js

@@ -228,6 +228,8 @@ define(['app/app'], function(app) {
                 }, function(response) {
                     toaster.pop('error', '获取指定的发票信息失败');
                 });
+            } else {
+                return {};
             }
         };