Merge branch 'dev' into 'mp-server-test'

查询商品列表

See merge request quanshu/mp-server!62

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -74,7 +74,7 @@ public class GoodsMgrController extends BaseApiController {
 		List<GoodsListVO> goodsListVOList = mapperFacade.mapAsList(goodsList, GoodsListVO.class);
 		TableDataInfo res = getDataTable(goodsList);
 		res.setRows(goodsListVOList);
-		return getDataTable(list);
+		return res;
 	}