Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 server/dmmall_service/src/main/java/com/doumee/service/business/GoodsService.java

@@ -122,7 +122,7 @@
     * @param pageWrap
     * @return
     */
    IPage<GoodsInfoResponse> getGoodsPage(PageWrap<GoodsRequest> pageWrap);
    IPage<Goods> getGoodsPage(PageWrap<GoodsRequest> pageWrap);


    /**
@@ -130,7 +130,7 @@
     * @param goodsId
     * @return
     */
    GoodsInfoResponse getGoodsInfo(Integer goodsId);
    Goods getGoodsInfo(Integer goodsId,Integer memberId);


    /**