blame | history | patch | commit | commitdiff | ignore whitespace
zepengdev
2025-06-04 3d75712b9cc5ff70abc45808594ffd303e35ef64 
 oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java


@@ -3,7 +3,7 @@


import cn.hutool.core.collection.ListUtil;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.oying.annotation.Log;


import com.oying.modules.pc.common.core.domain.R;


import com.oying.utils.R;


import com.oying.modules.pc.product.domain.Product;


import com.oying.modules.pc.product.domain.dto.ProductMerchantCreateRequest;


import com.oying.modules.pc.product.domain.dto.ProductMerchantUpdateRequest;


@@ -19,7 +19,6 @@


import lombok.RequiredArgsConstructor;


import org.springframework.beans.BeanUtils;


import org.springframework.http.ResponseEntity;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;