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

cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java

@@ -1,13 +1,13 @@
 package com.czg.controller.user;
 
-import com.czg.market.entity.ShopCoupon;
 import com.czg.market.service.MkBirthdayGiftService;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * 生日有礼相关
@@ -24,7 +24,7 @@ public class UBirthdayGiftController {
      * 获取生日有礼 不为空则代表今日发放生日有礼的奖励
      */
     @GetMapping
-    public CzgResult<List<ShopCoupon>> detail(@RequestParam Integer shopId) {
+    public CzgResult<ArrayList<Map<String, Object>>> detail(@RequestParam Integer shopId) {
         return CzgResult.success(service.getInfo(StpKit.USER.getLoginIdAsLong(), shopId));
     }