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

无关风月

8 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-account/src/main/java/com/dsh/account/service/IVipPaymentService.java

@@ -22,7 +22,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil addVipPayment(Integer uid, Integer payType) throws Exception;
    ResultUtil addVipPayment(Integer uid, Integer payType,Integer vipId) throws Exception;


    /**