Merge remote-tracking branch 'origin/release-201839-wangcz' into release-201839-wangcz

src/main/webapp/resources/js/admin/controllers/product/productManageCtrl.js

@@ -115,6 +115,7 @@ define(['app/app'], function(app) {
         };
         $scope.goodsFilter = {};
         $scope.kindPojo = {};
+        $scope.goodsFilter.saleStatus = 601;
         var initTitleInfo = function () {
             BackgroundRecord.getUserTitle({}, function (data) {
                 $scope.tableTabs = data;