Merge branch 'pxb' into xin

xin

yesterday d3563f0bdb487124d79cdd20d0f8bfc79db31f24

 oying-system/src/main/java/com/oying/modules/rider/service/RiderWalletInfoService.java

@@ -62,5 +62,5 @@
     * @param riderId 条件
     * @return RiderWalletInfo
     */
    RiderWalletInfo getRiderWalletInfo(String riderId);
    RiderWalletInfo getRiderWalletInfo(Long riderId);
}