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

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

@@ -6,7 +6,7 @@ define(['app/app'], function(app) {
 
             $scope.tableParams = new ngTableParams({
                 page: 1,
-                count: 10
+                size: 10
             }, {
                 total: 0,
                 getData: function ($defer, params) {