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

huliguo

8 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java

@@ -400,4 +400,9 @@
     * @return
     */
    R addIntegralRecord(Integer integral, Long userId, String orderId);
    
    /**
     * 获取微信二维码
     */
    String getWeiXinQrCode(String scene, String path);
}