Merge remote-tracking branch 'origin/master'

doum

14 小时以前 ae917e09a897843344424ca7d36dd22c216f5f50

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

@@ -197,5 +197,4 @@

    void updateShop(Member member);

    void updateIntegral(Integral param);
}