From 51f26723bee741bf112c8d0d965d0e2f2974bd04 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 31 三月 2025 10:02:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java index a6c7435..9664571 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java @@ -97,6 +97,7 @@ * @throws Exception */ ResultUtil updatePassword(String phone, String code, String password) throws Exception; + ResultUtil updatePassword1(String phone, String code, String password) throws Exception; /** @@ -156,11 +157,11 @@ * @param orderNumber * @return */ - ResultUtil paymentCouponCallback(String code, String orderNumber); + ResultUtil paymentCouponCallback(String code, String orderNumber) throws Exception; - ResultUtil exchangeAddPaymentCallback(String code, String orderNumber, Integer payType); + ResultUtil exchangeAddPaymentCallback(String code, String orderNumber); List<StoreResponse> queryStoresOfExchange(Integer goodsType, Integer pointsMerId); -- Gitblit v1.7.1