Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-28 e290789c592db88cfbffac7ecbdcd8f998e45796

 server/src/main/java/doumeemes/service/system/WxLoginService.java

@@ -22,5 +22,5 @@

    void wxLoginOut(WxLoginOutDTO wxLoginOutDTO);

    WxLoginVO wxProgramLogin(String unionId, String openId,HttpServletRequest request);
    WxLoginVO wxProgramLogin(String code,HttpServletRequest request);
}