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

jiaosong

2023-08-28 a79f7d80e55319ae1a40954f6a4ce6e382cc1649

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