Merge remote-tracking branch 'origin/dev' into dev

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 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);
}