From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
index fa07c1d..6b6b72c 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
@@ -1,6 +1,5 @@
 package com.oying.modules.sh.rest;
 
-import com.oying.annotation.Log;
 import com.oying.modules.sh.domain.OrderReturnOperationLog;
 import com.oying.modules.sh.service.OrderReturnOperationLogService;
 import com.oying.modules.sh.domain.dto.OrderReturnOperationLogQueryCriteria;
@@ -9,7 +8,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import java.io.IOException;

--
Gitblit v1.9.3