From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionStoreApi.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionStoreApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionStoreApi.java
index cd63a48..72bc9dd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionStoreApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionStoreApi.java
@@ -1,6 +1,7 @@
 package com.chuangongzhijia.huacheng_union_applets.api;
 
 import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.equipment.UnionShippingAddressDto;
 import com.panzhihua.common.model.dtos.equipment.UnionStoreDto;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.service.community.ComEquipmentUnionStoreLDD;
@@ -16,7 +17,7 @@
 @Api(tags = {"商城商品相关"})
 @RestController
 @RequestMapping("/UnionStore")
-public class UnionStoreApi extends BaseController {
+public class UnionStoreApi{
 
     @Resource
     private ComEquipmentUnionStoreLDD comEquipmentUnionStoreLDD;
@@ -27,7 +28,7 @@
      *
      * @return 总工会户外劳动商品列表
      */
-    @ApiOperation(value = "总工会户外劳动商品列表")
+    @ApiOperation(value = "总工会户外劳动商品列表", response = UnionStoreDto.class)
     @GetMapping("/getList")
     public R getList(@RequestParam("pageNum") int pageNum,
                      @RequestParam("pageSize") int pageSize,
@@ -39,6 +40,18 @@
     }
 
     /**
+     * 总工会户外劳动商品列表
+     *
+     * @return 总工会户外劳动商品列表
+     */
+    @ApiOperation(value = "总工会户外劳动商品详情", response = UnionStoreDto.class)
+    @GetMapping("/getData")
+    public R getData(String id)
+    {
+        return comEquipmentUnionStoreLDD.getData(id);
+    }
+
+    /**
      * 总工会户外劳动商品新增
      *
      * @return 总工会户外劳动商品新增

--
Gitblit v1.7.1