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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

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

@@ -157,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);