Merge remote-tracking branch 'origin/master'

doum

10 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

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

@@ -149,7 +149,7 @@

    PlatformAboutVO getPlatformAboutUs();

    void logOut(String token,Integer memberId);
    void logOut(String token,Integer memberId,Integer userType);

    void logOff(String token,Integer memberId);